feat(context): add warehouse verification tools (#46)

* feat(context): add warehouse dialect dispatch

* feat(context): read warehouse scan catalog

* feat(context): add entity details verification tool

* feat(context): add ingest SQL verification tool

* feat(context): add raw warehouse discovery tool

* feat(context): expose warehouse verification tools to ingest

* docs(context): add ingest identifier verification protocol

* test(context): guard ingest identifier verification prompts

* chore(context): verify warehouse verification tools

* docs: add warehouse verification tools plan and spec

* fix(context): expose target warehouses to Notion ingest

* fix(context): update ingest prompts for warehouse verification tools

* fix(context): scope raw schema discovery to allowed connections

* fix(context): verify warehouse column display targets

* docs: add notion warehouse verification gap closure plan

* fix(context): include raw discovery connection names

* fix(context): expose warehouse targets for LookML and MetricFlow

* fix(context): pass connection config to ingest query executors

* fix(cli): enable read-only SQL probes for local ingest

* docs: add warehouse verification final v1 closure plan

* fix(context): align warehouse sql probe prompt shape

* docs: add warehouse verification prompt shape closure plan

* test(context): catch connectionless sql execution prompt examples

* fix(context): include connection name in sl capture sql example

* docs: add warehouse verification sql example closure plan

* fix(context): report structured entity detail misses

* docs: add warehouse verification structured target miss closure plan

* fix: report untracked squash merge conflicts

* feat: require ingest verification ledger

* fix: stabilize ingest wiki references

docs/superpowers/plans/2026-05-12-notion-warehouse-verification-gap-closure.md

@@ -0,0 +1,785 @@
+# Notion Warehouse Verification Gap Closure Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Close the remaining v1 gaps that prevent ingest agents, especially
+Notion WorkUnits, from reliably verifying warehouse table and column
+identifiers before writing wiki or semantic-layer output.
+
+**Architecture:** Keep the existing warehouse verification tool module and
+runner wiring. Add Notion target-warehouse scoping through the local adapter
+factory, make the active WorkUnit prompt name the shipped tools, enforce
+`allowedConnectionNames` in `discover_data`, and teach `entity_details` to
+resolve and reject column-level display targets.
+
+**Tech Stack:** TypeScript, Node 22, Vitest, AI SDK v6 tools, Zod, KTX local
+ingest adapters, KTX file store.
+
+---
+
+## Audit summary
+
+The previous implementation plan landed the main tool module and prompt
+protocol, but four v1-blocking gaps remain:
+
+- Notion ingest sessions still allow only the Notion connection unless a
+  specific adapter supplies target IDs. `NotionSourceAdapter` does not supply
+  target warehouse IDs, so the original Notion hallucination case cannot use
+  `entity_details` or raw-schema `discover_data` for the warehouse connection.
+- The active WorkUnit framing prompt still tells agents to call
+  `wiki_sl_search` and `sl_describe_table`, which are not shipped KTX tools.
+- `discover_data` accepts an explicit out-of-scope `connectionName` and still
+  searches raw schema for that connection.
+- `entity_details({ targets: [{ display: "schema.table.column" }] })` does not
+  resolve column display strings and does not fail explicit missing-column
+  targets.
+
+Non-blocking gaps remain out of scope for this plan:
+
+- Full DDL-style `entity_details` formatting with FK and profile summaries.
+- AST-backed SQL read-only validation for data-modifying CTEs.
+- Search over `enrichment/descriptions.json` for generated descriptions.
+- Lexicographic latest-sync edge cases for non-timestamp sync IDs.
+- Hard write-time validation in `wiki_write` and `emit_unmapped_fallback`.
+
+## File structure
+
+Modify these files:
+
+- `packages/context/src/ingest/adapters/notion/notion.adapter.ts`: add
+  configured target warehouse IDs and implement `listTargetConnectionIds()`.
+- `packages/context/src/ingest/adapters/notion/notion.adapter.test.ts`: cover
+  Notion target connection ID fan-out.
+- `packages/context/src/ingest/local-adapters.ts`: pass primary warehouse IDs
+  into `NotionSourceAdapter`.
+- `packages/context/src/ingest/local-adapters.test.ts`: cover local Notion
+  adapter target IDs.
+- `packages/context/src/ingest/adapters/notion/chunk.ts`: update Notion
+  WorkUnit notes to prefer the warehouse verification tools.
+- `packages/context/src/ingest/adapters/notion/notion.adapter.test.ts`: update
+  Notion note expectations.
+- `packages/context/prompts/memory_agent_bundle_ingest_work_unit.md`: replace
+  stale tool names in the active WorkUnit prompt.
+- `packages/context/src/ingest/ingest-prompts.test.ts`: guard the WorkUnit
+  prompt against stale tool names.
+- `packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts`:
+  refuse explicit out-of-scope connection names.
+- `packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts`:
+  cover `discover_data` scoping.
+- `packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts`:
+  add column-aware display-target resolution.
+- `packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts`:
+  cover column display resolution.
+- `packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.ts`:
+  use column-aware resolution and report missing columns.
+- `packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.test.ts`:
+  cover column display and missing-column behavior.
+
+### Task 1: Give Notion ingest access to target warehouses
+
+**Files:**
+- Modify: `packages/context/src/ingest/adapters/notion/notion.adapter.ts`
+- Modify: `packages/context/src/ingest/adapters/notion/notion.adapter.test.ts`
+- Modify: `packages/context/src/ingest/local-adapters.ts`
+- Modify: `packages/context/src/ingest/local-adapters.test.ts`
+
+- [ ] **Step 1: Write the failing Notion adapter test**
+
+Add this test inside `describe('NotionSourceAdapter', ...)` in
+`packages/context/src/ingest/adapters/notion/notion.adapter.test.ts`:
+
+```ts
+it('returns configured target warehouse connection ids', async () => {
+  const adapter = new NotionSourceAdapter({
+    targetConnectionIds: ['warehouse', 'warehouse', 'analytics'],
+  });
+
+  await expect(adapter.listTargetConnectionIds?.(stagedDir)).resolves.toEqual([
+    'analytics',
+    'warehouse',
+  ]);
+});
+```
+
+- [ ] **Step 2: Run the failing Notion adapter test**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/adapters/notion/notion.adapter.test.ts -t "target warehouse connection ids"
+```
+
+Expected: FAIL because `NotionSourceAdapterDeps` has no
+`targetConnectionIds` option and `NotionSourceAdapter` does not implement
+`listTargetConnectionIds()`.
+
+- [ ] **Step 3: Implement Notion target connection IDs**
+
+Modify `packages/context/src/ingest/adapters/notion/notion.adapter.ts`:
+
+```ts
+export interface NotionSourceAdapterDeps {
+  onPullSucceeded?: (ctx: NotionPullSucceededContext) => Promise<void>;
+  logger?: NotionFetchLogger;
+  targetConnectionIds?: string[];
+}
+
+function uniqueSorted(values: readonly string[] | undefined): string[] {
+  return [...new Set(values ?? [])].sort((left, right) =>
+    left.localeCompare(right),
+  );
+}
+```
+
+Add this method to `NotionSourceAdapter`:
+
+```ts
+  async listTargetConnectionIds(_stagedDir: string): Promise<string[]> {
+    return uniqueSorted(this.deps.targetConnectionIds);
+  }
+```
+
+- [ ] **Step 4: Pass primary warehouses into the local Notion adapter**
+
+Modify the Notion adapter construction in
+`packages/context/src/ingest/local-adapters.ts`:
+
+```ts
+    new NotionSourceAdapter({
+      targetConnectionIds: primaryWarehouseConnectionIds(project),
+      ...(options.logger ? { logger: options.logger } : {}),
+    }),
+```
+
+- [ ] **Step 5: Write the local adapter fan-out test**
+
+Add this test to `packages/context/src/ingest/local-adapters.test.ts`:
+
+```ts
+it('passes primary warehouse connection ids to the local Notion adapter', async () => {
+  const adapters = createDefaultLocalIngestAdapters(
+    projectWithConnections({
+      notion: {
+        driver: 'notion',
+        auth_token: 'secret',
+        crawl_mode: 'selected_roots',
+        root_page_ids: ['page-1'],
+      },
+      warehouse: {
+        driver: 'postgres',
+        url: 'postgresql://readonly@db.example.test/analytics',
+      },
+      docs: {
+        driver: 'dbt',
+        source_dir: './dbt',
+      },
+    } as never),
+  );
+
+  const notion = adapters.find((adapter) => adapter.source === 'notion');
+
+  await expect(notion?.listTargetConnectionIds?.('/tmp/staged-notion')).resolves.toEqual([
+    'warehouse',
+  ]);
+});
+```
+
+- [ ] **Step 6: Run the Notion target tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run \
+  src/ingest/adapters/notion/notion.adapter.test.ts -t "target warehouse connection ids" \
+  src/ingest/local-adapters.test.ts -t "local Notion adapter"
+```
+
+Expected: PASS.
+
+- [ ] **Step 7: Commit**
+
+Run:
+
+```bash
+git add \
+  packages/context/src/ingest/adapters/notion/notion.adapter.ts \
+  packages/context/src/ingest/adapters/notion/notion.adapter.test.ts \
+  packages/context/src/ingest/local-adapters.ts \
+  packages/context/src/ingest/local-adapters.test.ts
+git commit -m "fix(context): expose target warehouses to Notion ingest"
+```
+
+### Task 2: Remove stale tool names from active ingest prompts
+
+**Files:**
+- Modify: `packages/context/prompts/memory_agent_bundle_ingest_work_unit.md`
+- Modify: `packages/context/src/ingest/ingest-prompts.test.ts`
+- Modify: `packages/context/src/ingest/adapters/notion/chunk.ts`
+- Modify: `packages/context/src/ingest/adapters/notion/notion.adapter.test.ts`
+
+- [ ] **Step 1: Add failing prompt guards**
+
+Add this test to `packages/context/src/ingest/ingest-prompts.test.ts`:
+
+```ts
+it('uses shipped warehouse verification tools in the WorkUnit prompt', async () => {
+  const prompt = await readFile(
+    new URL('../../prompts/memory_agent_bundle_ingest_work_unit.md', import.meta.url),
+    'utf-8',
+  );
+
+  expect(prompt).toContain('discover_data');
+  expect(prompt).toContain('entity_details');
+  expect(prompt).not.toContain('wiki_sl_search');
+  expect(prompt).not.toContain('sl_describe_table');
+});
+```
+
+- [ ] **Step 2: Run the failing prompt guard**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/ingest-prompts.test.ts -t "warehouse verification tools"
+```
+
+Expected: FAIL because the WorkUnit prompt still contains `wiki_sl_search` and
+`sl_describe_table`.
+
+- [ ] **Step 3: Update the WorkUnit framing prompt**
+
+In `packages/context/prompts/memory_agent_bundle_ingest_work_unit.md`, replace
+the first `<role>` paragraph with:
+
+```md
+You are processing ONE WorkUnit of a multi-file ingest bundle. The WorkUnit gives you a slice of raw source files (LookML views, dbt/MetricFlow YAMLs, Metabase card JSONs, Notion pages, or similar) and you must translate that slice into KTX semantic-layer sources and/or knowledge wiki pages, in one pass. Prior WorkUnits in this same job may have already written SL sources and wiki pages; their writes are visible on the working branch and discoverable with `discover_data`.
+```
+
+In workflow step 2, replace the final sentence with:
+
+```md
+The triage skill tells you how to react when `discover_data` reveals that a prior WU already wrote something overlapping.
+```
+
+In workflow step 4, replace the sentence that starts
+`For each raw file:` with:
+
+```md
+4. For each raw file: call `read_raw_file` (or `read_raw_span` for slicing large files) to load content. Before writing a new SL source or wiki page, call `discover_data` for each candidate source, table, metric, or topic name to find prior-WU writes, existing wiki pages, SL sources, and raw warehouse matches; apply `ingest_triage` when you hit one, and apply any matching canonical pin before deciding whether to edit, rename, or skip.
+```
+
+In the `<do_not>` block, replace the physical-column rule with:
+
+```md
+- Do not invent physical column names or grain keys. For table-backed SL sources, every `columns:`, `grain:`, `joins:`, `segments:`, and `measures[].expr` column must come from raw-file column declarations or warehouse-backed discovery (`discover_data`, `sl_discover`, `entity_details`). If column names are not confirmed, capture the business context in wiki instead of writing a full SL source.
+```
+
+- [ ] **Step 4: Update Notion WorkUnit notes**
+
+In `packages/context/src/ingest/adapters/notion/chunk.ts`, replace
+`NOTION_SL_WRITE_GUIDANCE` with:
+
+```ts
+const NOTION_SL_WRITE_GUIDANCE =
+  'Write wiki entries with wiki_write. Wiki keys must be flat slugs like orbit-company-overview, not orbit/company-overview. Search existing wiki pages, SL sources, and raw warehouse schema for the same tables or sl_refs with discover_data before creating a new page. Only write or edit SL sources after discover_data plus sl_discover/sl_read_source or entity_details confirms a mapped non-Notion target source; if no mapped target exists, emit_unmapped_fallback and keep the fact wiki-only. Notion dataSourceCount counts Notion databases/data sources only, not warehouse/dbt mappings. If a warehouse/dbt connection exists but the named table or source is absent, use reason no_physical_table rather than no_connection_mapping. Do not create SL sources under the Notion connection just because a page mentions a warehouse table.';
+```
+
+In the `reconcileNotes` array in the same file, replace:
+
+```ts
+      'Notion dataSourceCount is Notion-only; use sl_discover for warehouse/dbt mapping decisions.',
+```
+
+with:
+
+```ts
+      'Notion dataSourceCount is Notion-only; use discover_data/entity_details for warehouse/dbt mapping decisions.',
+```
+
+- [ ] **Step 5: Update Notion note expectations**
+
+In `packages/context/src/ingest/adapters/notion/notion.adapter.test.ts`,
+update the note expectations in `it('chunks changed Notion pages...')`:
+
+```ts
+expect(result.workUnits[0].notes).toContain('discover_data');
+expect(result.workUnits[0].notes).toContain('entity_details');
+```
+
+Update the exact `reconcileNotes` expectation to:
+
+```ts
+expect(result.reconcileNotes).toEqual([
+  'Notion maxKnowledgeCreatesPerRun=25',
+  'Notion maxKnowledgeUpdatesPerRun=20',
+  'Notion dataSourceCount is Notion-only; use discover_data/entity_details for warehouse/dbt mapping decisions.',
+  'Reconcile Notion wiki pages sharing tables/sl_refs before creating distinct artifacts.',
+]);
+```
+
+- [ ] **Step 6: Run prompt and Notion note tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run \
+  src/ingest/ingest-prompts.test.ts \
+  src/ingest/adapters/notion/notion.adapter.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 7: Commit**
+
+Run:
+
+```bash
+git add \
+  packages/context/prompts/memory_agent_bundle_ingest_work_unit.md \
+  packages/context/src/ingest/ingest-prompts.test.ts \
+  packages/context/src/ingest/adapters/notion/chunk.ts \
+  packages/context/src/ingest/adapters/notion/notion.adapter.test.ts
+git commit -m "fix(context): update ingest prompts for warehouse verification tools"
+```
+
+### Task 3: Enforce allowed connection scope in discover_data
+
+**Files:**
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts`
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts`
+
+- [ ] **Step 1: Write the failing scoping test**
+
+Add this test to
+`packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts`:
+
+```ts
+it('refuses explicit out-of-scope connection names', async () => {
+  const result = await tool.call({ query: 'orders', connectionName: 'billing' }, context);
+
+  expect(result.markdown).toContain('Connection "billing" is not available to this ingest stage.');
+  expect(result.structured).toEqual({ wiki: null, sl: null, raw: null });
+  expect(wikiSearchTool.call).not.toHaveBeenCalled();
+  expect(slDiscoverTool.call).not.toHaveBeenCalled();
+  expect(catalog.searchByName).not.toHaveBeenCalled();
+});
+```
+
+- [ ] **Step 2: Run the failing scoping test**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/tools/warehouse-verification/discover-data.tool.test.ts -t "out-of-scope"
+```
+
+Expected: FAIL because `discover_data` currently searches raw schema for an
+explicit `connectionName` even when it is not in `allowedConnectionNames`.
+
+- [ ] **Step 3: Add the scope guard**
+
+In
+`packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts`,
+add this helper near `totalSources()`:
+
+```ts
+function allowedConnectionNames(context: ToolContext): ReadonlySet<string> | null {
+  return context.session?.allowedConnectionNames ?? null;
+}
+```
+
+At the top of `DiscoverDataTool.call()`, before the `sourceName` branch and
+before calling any child tool, add:
+
+```ts
+    const allowed = allowedConnectionNames(context);
+    if (input.connectionName && allowed && !allowed.has(input.connectionName)) {
+      return {
+        markdown: `Connection "${input.connectionName}" is not available to this ingest stage.`,
+        structured: { wiki: null, sl: null, raw: null },
+      };
+    }
+```
+
+Then replace the raw connection-list construction with:
+
+```ts
+    const connections = input.connectionName ? [input.connectionName] : [...(allowed ?? [])].sort();
+```
+
+- [ ] **Step 4: Run discover_data tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/tools/warehouse-verification/discover-data.tool.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 5: Commit**
+
+Run:
+
+```bash
+git add \
+  packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts \
+  packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts
+git commit -m "fix(context): scope raw schema discovery to allowed connections"
+```
+
+### Task 4: Fix column-level entity_details verification
+
+**Files:**
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts`
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts`
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.ts`
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.test.ts`
+
+- [ ] **Step 1: Write failing catalog column-target tests**
+
+First update `seedLiveDatabaseScan()` in that test file so BigQuery tables have
+a project/catalog. Replace the repeated inline table refs with:
+
+```ts
+const tableRef = {
+  catalog: driver === 'bigquery' ? 'analytics' : null,
+  db: driver === 'sqlite' ? null : 'public',
+  name: 'orders',
+};
+```
+
+Use `tableRef.catalog`, `tableRef.db`, and `tableRef.name` for the seeded
+table and profile table references.
+
+Then add these tests to
+`packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts`:
+
+```ts
+it('resolves postgres column display strings without treating the column as a table', async () => {
+  await seedLiveDatabaseScan();
+  const catalog = new WarehouseCatalogService({ fileStore: project.fileStore });
+
+  await expect(catalog.resolveDisplayTarget('warehouse', 'public.orders.status')).resolves.toMatchObject({
+    resolved: { catalog: null, db: 'public', name: 'orders', column: 'status' },
+    candidates: [],
+    dialect: 'postgres',
+  });
+});
+
+it('resolves BigQuery column display strings with four parts', async () => {
+  await seedLiveDatabaseScan('warehouse', 'sync-bigquery', 'bigquery');
+  const catalog = new WarehouseCatalogService({ fileStore: project.fileStore });
+
+  await expect(catalog.resolveDisplayTarget('warehouse', 'analytics.public.orders.status')).resolves.toMatchObject({
+    resolved: { catalog: 'analytics', db: 'public', name: 'orders', column: 'status' },
+    candidates: [],
+    dialect: 'bigquery',
+  });
+});
+```
+
+- [ ] **Step 2: Run the failing catalog tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts -t "column display"
+```
+
+Expected: FAIL because `resolveDisplayTarget()` does not exist.
+
+- [ ] **Step 3: Implement column-aware display resolution**
+
+In
+`packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts`,
+add this exported interface near `RawSchemaHit`:
+
+```ts
+export interface DisplayTargetResolution {
+  resolved: (KtxTableRef & { column?: string }) | null;
+  candidates: KtxTableRef[];
+  dialect: string;
+}
+```
+
+Add these helpers near `parseDisplay()`:
+
+```ts
+function expectedDisplayPartCount(driver: CatalogDriver): number {
+  if (driver === 'sqlite' || driver === 'sqlite3') {
+    return 1;
+  }
+  if (driver === 'bigquery' || driver === 'snowflake' || driver === 'sqlserver') {
+    return 3;
+  }
+  return 2;
+}
+
+function parseColumnDisplay(driver: CatalogDriver, display: string): (KtxTableRef & { column: string }) | null {
+  const parts = splitDisplay(display);
+  const tablePartCount = expectedDisplayPartCount(driver);
+  if (parts.length !== tablePartCount + 1) {
+    return null;
+  }
+  const column = parts.at(-1);
+  if (!column) {
+    return null;
+  }
+  const table = parseDisplay(driver, parts.slice(0, -1).join('.'));
+  return table ? { ...table, column } : null;
+}
+```
+
+Add this method to `WarehouseCatalogService` after `resolveDisplay()`:
+
+```ts
+  async resolveDisplayTarget(connectionName: string, display: string): Promise<DisplayTargetResolution> {
+    const catalog = await this.loadCatalog(connectionName);
+    if (!catalog) {
+      return { resolved: null, candidates: [], dialect: 'unknown' };
+    }
+
+    const dialect = getDialectForDriver(catalog.driver).type;
+    const tableResolution = await this.resolveDisplay(connectionName, display);
+    if (tableResolution.resolved) {
+      return tableResolution;
+    }
+
+    const parsedColumn = parseColumnDisplay(catalog.driver, display);
+    if (!parsedColumn) {
+      return { resolved: null, candidates: bestCandidates(catalog.tables, display), dialect };
+    }
+
+    const table = catalog.tables.find((candidate) => refsEqual(candidate, parsedColumn));
+    if (!table) {
+      return { resolved: null, candidates: bestCandidates(catalog.tables, display), dialect };
+    }
+
+    return {
+      resolved: {
+        catalog: table.catalog,
+        db: table.db,
+        name: table.name,
+        column: parsedColumn.column,
+      },
+      candidates: [],
+      dialect,
+    };
+  }
+```
+
+- [ ] **Step 4: Write failing entity_details column tests**
+
+Add these tests to
+`packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.test.ts`:
+
+```ts
+it('resolves display targets that include a column name', async () => {
+  const result = await tool.call(
+    { connectionName: 'warehouse', targets: [{ display: 'public.orders.status' }] },
+    context,
+  );
+
+  expect(result.markdown).toContain('### public.orders');
+  expect(result.markdown).toContain('- status (text, nullable=false)');
+  expect(result.markdown).not.toContain('- id (integer');
+  expect(result.structured.resolved).toHaveLength(1);
+  expect(result.structured.resolved[0]?.columns.map((column) => column.name)).toEqual(['status']);
+});
+
+it('reports missing explicit columns instead of returning an empty column list', async () => {
+  const result = await tool.call(
+    { connectionName: 'warehouse', targets: [{ display: 'public.orders.plan_tier' }] },
+    context,
+  );
+
+  expect(result.markdown).toContain('Column not found in scan: public.orders.plan_tier');
+  expect(result.markdown).toContain('Available columns: id, status');
+  expect(result.structured.resolved).toHaveLength(0);
+  expect(result.structured.missing).toHaveLength(1);
+});
+```
+
+- [ ] **Step 5: Run the failing entity_details tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/tools/warehouse-verification/entity-details.tool.test.ts -t "column"
+```
+
+Expected: FAIL because display column targets are treated as table names and
+missing columns are not reported.
+
+- [ ] **Step 6: Use column-aware resolution in entity_details**
+
+In
+`packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.ts`,
+add this helper near `appendTableMarkdown()`:
+
+```ts
+function findColumn(detail: TableDetail, columnName: string): TableDetail['columns'][number] | null {
+  const normalized = columnName.toLowerCase();
+  return detail.columns.find((column) => column.name.toLowerCase() === normalized) ?? null;
+}
+```
+
+Replace the display resolution block inside the `for (const target of
+input.targets)` loop with:
+
+```ts
+      const resolution =
+        'display' in target
+          ? await catalog.resolveDisplayTarget(input.connectionName, target.display)
+          : {
+              resolved: { catalog: target.catalog, db: target.db, name: target.name, column: target.column },
+              candidates: [],
+              dialect: '',
+            };
+```
+
+After `const detail = await catalog.getTable(...)`, replace the existing
+`resolved.push(detail); appendTableMarkdown(...)` lines with:
+
+```ts
+      const requestedColumn = resolution.resolved.column;
+      if (requestedColumn) {
+        const column = findColumn(detail, requestedColumn);
+        if (!column) {
+          missing.push({
+            target,
+            candidates: [{ catalog: detail.catalog, db: detail.db, name: detail.name }],
+          });
+          parts.push(`Column not found in scan: ${detail.display}.${requestedColumn}`);
+          parts.push(`Available columns: ${detail.columns.map((candidate) => candidate.name).join(', ')}`);
+          continue;
+        }
+        const scopedDetail = { ...detail, columns: [column] };
+        resolved.push(scopedDetail);
+        appendTableMarkdown(parts, scopedDetail, column.name);
+        continue;
+      }
+
+      resolved.push(detail);
+      appendTableMarkdown(parts, detail);
+```
+
+- [ ] **Step 7: Run warehouse verification tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run \
+  src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts \
+  src/ingest/tools/warehouse-verification/entity-details.tool.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 8: Commit**
+
+Run:
+
+```bash
+git add \
+  packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts \
+  packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts \
+  packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.ts \
+  packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.test.ts
+git commit -m "fix(context): verify warehouse column display targets"
+```
+
+### Task 5: Verify the v1 gap closure
+
+**Files:**
+- Verify all files changed by Tasks 1-4.
+
+- [ ] **Step 1: Run focused tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run \
+  src/ingest/adapters/notion/notion.adapter.test.ts \
+  src/ingest/local-adapters.test.ts \
+  src/ingest/ingest-prompts.test.ts \
+  src/ingest/tools/warehouse-verification/discover-data.tool.test.ts \
+  src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts \
+  src/ingest/tools/warehouse-verification/entity-details.tool.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 2: Run package type-check**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context run type-check
+```
+
+Expected: PASS.
+
+- [ ] **Step 3: Run package tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context run test
+```
+
+Expected: PASS.
+
+- [ ] **Step 4: Run pre-commit on changed files when configured**
+
+Run:
+
+```bash
+uv run pre-commit run --files \
+  packages/context/src/ingest/adapters/notion/notion.adapter.ts \
+  packages/context/src/ingest/adapters/notion/notion.adapter.test.ts \
+  packages/context/src/ingest/local-adapters.ts \
+  packages/context/src/ingest/local-adapters.test.ts \
+  packages/context/src/ingest/adapters/notion/chunk.ts \
+  packages/context/prompts/memory_agent_bundle_ingest_work_unit.md \
+  packages/context/src/ingest/ingest-prompts.test.ts \
+  packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts \
+  packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts \
+  packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts \
+  packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts \
+  packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.ts \
+  packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.test.ts
+```
+
+Expected: PASS. If the repo has no pre-commit config or the local `uv` version
+cannot satisfy the project pin, record the exact error and rely on focused
+tests plus type-check.
+
+- [ ] **Step 5: Inspect final git status**
+
+Run:
+
+```bash
+git status --short
+```
+
+Expected: only intentional files are modified. Commit any formatter-driven
+changes with:
+
+```bash
+git add packages/context
+git commit -m "chore(context): verify warehouse verification v1 gaps"
+```
+
+## Self-review checklist
+
+- Spec coverage: this plan closes the remaining v1 paths for Notion warehouse
+  verification, active WorkUnit prompt correctness, raw discovery scoping, and
+  column-level identifier verification.
+- Placeholder scan: no task relies on future-work markers, unnamed edge-case
+  handling, or cross-task shorthand.
+- Type consistency: `discover_data` continues to use `connectionName`,
+  `sl_discover` still receives `connectionId` internally, and
+  `resolveDisplayTarget()` returns the same table identity plus optional
+  `column`.

docs/superpowers/plans/2026-05-12-warehouse-verification-final-v1-closure.md

@@ -0,0 +1,957 @@
+# Warehouse Verification Final V1 Closure Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Close the remaining v1 gaps that still prevent ingest agents from
+reliably following warehouse verification results through to `entity_details`
+and `sql_execution`.
+
+**Architecture:** Keep the existing warehouse verification module and runner
+session scoping. Add connection names to raw discovery hits, expose primary
+warehouse targets from the remaining source adapters, and make local ingest
+SQL probes use the same scan connector read-only execution path as schema scan.
+
+**Tech Stack:** TypeScript, Node 22, Vitest, AI SDK v6 tools, Zod, KTX local
+ingest runtime, KTX scan connectors.
+
+---
+
+## Audit summary
+
+The first two implementation plans landed the warehouse verification tools,
+prompt protocol, Notion warehouse scoping, and stale prompt-name cleanup. The
+focused audit on May 12, 2026, found three remaining v1-blocking gaps:
+
+- `discover_data` searches multiple allowed raw warehouse scans, but raw hits do
+  not carry or render `connectionName`. The tool tells the agent to call
+  `entity_details({connectionName, targets: [...]})`, then omits the required
+  `connectionName` from the follow-up evidence.
+- Local LookML and MetricFlow adapters do not expose primary warehouse target
+  IDs. The runner only adds adapter-provided targets to `allowedConnectionNames`,
+  so those WorkUnits cannot use raw warehouse verification unless their source
+  connection is itself the warehouse.
+- `sql_execution` calls the local ingest connection catalog, but the catalog
+  either has no query executor in normal CLI ingest or calls an injected
+  executor without `projectDir` and connection config. The default local query
+  executor cannot dispatch without that config.
+
+Non-blocking gaps remain out of scope for this v1 plan:
+
+- Full DDL-style `entity_details` formatting with FK profile summaries.
+- AST-backed SQL read-only validation for data-modifying CTE bodies.
+- Search over generated `enrichment/descriptions.json`.
+- Lexicographic latest-sync edge cases for non-timestamp sync IDs.
+- Hard write-time validation in `wiki_write` and `emit_unmapped_fallback`.
+
+## File structure
+
+Modify these files:
+
+- `packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts`:
+  add `connectionName` to raw schema hit records.
+- `packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts`:
+  render raw hit connection names and preserve them in structured output.
+- `packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts`:
+  cover multi-connection raw discovery follow-up data.
+- `packages/context/src/ingest/adapters/lookml/lookml.adapter.ts`:
+  accept and return configured target warehouse connection IDs.
+- `packages/context/src/ingest/adapters/lookml/lookml.adapter.test.ts`:
+  cover LookML target warehouse IDs.
+- `packages/context/src/ingest/adapters/metricflow/metricflow.adapter.ts`:
+  accept and return configured target warehouse connection IDs.
+- `packages/context/src/ingest/adapters/metricflow/metricflow.adapter.test.ts`:
+  cover MetricFlow target warehouse IDs.
+- `packages/context/src/ingest/local-adapters.ts`:
+  pass primary warehouse IDs into LookML and MetricFlow adapters.
+- `packages/context/src/ingest/local-adapters.test.ts`:
+  cover local adapter warehouse target fan-out.
+- `packages/context/src/ingest/local-bundle-runtime.ts`:
+  pass full project connection config to local ingest query executors.
+- `packages/context/src/ingest/local-bundle-runtime.test.ts`:
+  cover the local ingest query executor call shape.
+- `packages/context/src/ingest/local-ingest.ts`:
+  use the shared query executor port type.
+- `packages/context/src/mcp/local-project-ports.ts`:
+  no behavior change expected, but type-checks against the updated local ingest
+  query executor type.
+- `packages/cli/src/ingest.ts`:
+  provide a read-only scan-connector-backed query executor for normal local
+  ingest runs.
+
+Create these files:
+
+- `packages/cli/src/ingest-query-executor.ts`: CLI query executor that adapts
+  scan connectors' `executeReadOnly()` method to `KtxSqlQueryExecutorPort`.
+- `packages/cli/src/ingest-query-executor.test.ts`: unit coverage for the CLI
+  ingest query executor.
+
+### Task 1: Preserve raw discovery connection names
+
+**Files:**
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts`
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts`
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts`
+
+- [ ] **Step 1: Write the failing multi-connection discovery test**
+
+Add this test to
+`packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts`:
+
+```ts
+  it('includes connectionName on raw schema hits so entity_details can follow up', async () => {
+    const multiConnectionContext: ToolContext = {
+      ...context,
+      session: { allowedConnectionNames: new Set(['warehouse', 'analytics']) } as any,
+    };
+    catalog.searchByName.mockImplementation(async (connectionName: string, query: string) => [
+      {
+        kind: 'table',
+        connectionName,
+        ref: { catalog: null, db: 'public', name: `${connectionName}_${query}` },
+        display: `public.${connectionName}_${query}`,
+        matchedOn: 'name',
+      },
+    ]);
+
+    const result = await tool.call({ query: 'orders', limit: 10 }, multiConnectionContext);
+
+    expect(catalog.searchByName).toHaveBeenCalledWith('analytics', 'orders', 10);
+    expect(catalog.searchByName).toHaveBeenCalledWith('warehouse', 'orders', 10);
+    expect(result.markdown).toContain('connectionName=analytics');
+    expect(result.markdown).toContain('connectionName=warehouse');
+    expect(result.markdown).toContain(
+      'entity_details({connectionName: "analytics", targets: [{display: "public.analytics_orders"}]})',
+    );
+    expect(result.structured.raw?.hits.map((hit) => hit.connectionName)).toEqual([
+      'analytics',
+      'warehouse',
+    ]);
+  });
+```
+
+- [ ] **Step 2: Run the failing discovery test**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/tools/warehouse-verification/discover-data.tool.test.ts -t "connectionName on raw schema hits"
+```
+
+Expected: FAIL because `RawSchemaHit` has no `connectionName` property and the
+markdown only renders the display string.
+
+- [ ] **Step 3: Add `connectionName` to raw schema hits**
+
+Modify the raw hit type and hit construction in
+`packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts`:
+
+```ts
+export type RawSchemaHit =
+  | {
+      kind: 'table';
+      connectionName: string;
+      ref: KtxTableRef;
+      display: string;
+      matchedOn: 'name' | 'db' | 'comment' | 'description';
+    }
+  | {
+      kind: 'column';
+      connectionName: string;
+      ref: KtxTableRef & { column: string };
+      display: string;
+      matchedOn: 'name' | 'comment' | 'description';
+    };
+```
+
+In the table hit block, add `connectionName`:
+
+```ts
+        hits.push({
+          kind: 'table',
+          connectionName,
+          ref: { catalog: table.catalog, db: table.db, name: table.name },
+          display: formatDisplay(catalog.driver, table),
+          matchedOn: tableMatch,
+        });
+```
+
+In the column hit block, add `connectionName`:
+
+```ts
+        hits.push({
+          kind: 'column',
+          connectionName,
+          ref: { catalog: table.catalog, db: table.db, name: table.name, column: column.name },
+          display: `${formatDisplay(catalog.driver, table)}.${column.name}`,
+          matchedOn: columnMatch,
+        });
+```
+
+- [ ] **Step 4: Render follow-up-ready raw hits**
+
+Modify the raw schema markdown in
+`packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts`:
+
+```ts
+      parts.push('## Raw Warehouse Schema', '> use `entity_details({connectionName, targets: [{display}]})` for full DDL + sample values');
+      parts.push(
+        rawHits
+          .slice(0, limit)
+          .map(
+            (hit) =>
+              `- ${hit.kind}: ${hit.display} [connectionName=${hit.connectionName}] (matched on ${hit.matchedOn}) — ` +
+              `follow up with \`entity_details({connectionName: "${hit.connectionName}", targets: [{display: "${hit.display}"}]})\``,
+          )
+          .join('\n'),
+      );
+```
+
+- [ ] **Step 5: Run the discovery test**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/tools/warehouse-verification/discover-data.tool.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 6: Commit**
+
+Run:
+
+```bash
+git add \
+  packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts \
+  packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts \
+  packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts
+git commit -m "fix(context): include raw discovery connection names"
+```
+
+### Task 2: Expose LookML and MetricFlow warehouse targets
+
+**Files:**
+- Modify: `packages/context/src/ingest/adapters/lookml/lookml.adapter.ts`
+- Modify: `packages/context/src/ingest/adapters/lookml/lookml.adapter.test.ts`
+- Modify: `packages/context/src/ingest/adapters/metricflow/metricflow.adapter.ts`
+- Modify: `packages/context/src/ingest/adapters/metricflow/metricflow.adapter.test.ts`
+- Modify: `packages/context/src/ingest/local-adapters.ts`
+- Modify: `packages/context/src/ingest/local-adapters.test.ts`
+
+- [ ] **Step 1: Write failing adapter target tests**
+
+Add this test to
+`packages/context/src/ingest/adapters/lookml/lookml.adapter.test.ts`:
+
+```ts
+  it('returns configured target warehouse connection ids', async () => {
+    const adapter = new LookmlSourceAdapter({
+      homeDir: join(tmpRoot, 'home'),
+      targetConnectionIds: ['warehouse', 'analytics', 'warehouse'],
+    });
+
+    await expect(adapter.listTargetConnectionIds?.(join(tmpRoot, 'staged'))).resolves.toEqual([
+      'analytics',
+      'warehouse',
+    ]);
+  });
+```
+
+Add this test to
+`packages/context/src/ingest/adapters/metricflow/metricflow.adapter.test.ts`:
+
+```ts
+  it('returns configured target warehouse connection ids', async () => {
+    const metricflow = new MetricflowSourceAdapter({
+      homeDir: join(tmpRoot, 'cache-home'),
+      targetConnectionIds: ['warehouse', 'analytics', 'warehouse'],
+    });
+
+    await expect(metricflow.listTargetConnectionIds?.(stagedDir)).resolves.toEqual([
+      'analytics',
+      'warehouse',
+    ]);
+  });
+```
+
+- [ ] **Step 2: Run the failing adapter tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run \
+  src/ingest/adapters/lookml/lookml.adapter.test.ts -t "target warehouse connection ids" \
+  src/ingest/adapters/metricflow/metricflow.adapter.test.ts -t "target warehouse connection ids"
+```
+
+Expected: FAIL because neither adapter accepts `targetConnectionIds` or
+implements `listTargetConnectionIds()`.
+
+- [ ] **Step 3: Implement target ID support in LookML**
+
+Modify `packages/context/src/ingest/adapters/lookml/lookml.adapter.ts`:
+
+```ts
+export interface LookmlSourceAdapterDeps {
+  homeDir: string;
+  targetConnectionIds?: string[];
+}
+
+function uniqueSorted(values: readonly string[] | undefined): string[] {
+  return [...new Set(values ?? [])].sort((left, right) => left.localeCompare(right));
+}
+```
+
+Add this method to `LookmlSourceAdapter`:
+
+```ts
+  async listTargetConnectionIds(_stagedDir: string): Promise<string[]> {
+    return uniqueSorted(this.deps.targetConnectionIds);
+  }
+```
+
+- [ ] **Step 4: Implement target ID support in MetricFlow**
+
+Modify `packages/context/src/ingest/adapters/metricflow/metricflow.adapter.ts`:
+
+```ts
+export interface MetricflowSourceAdapterDeps {
+  homeDir: string;
+  targetConnectionIds?: string[];
+}
+
+function uniqueSorted(values: readonly string[] | undefined): string[] {
+  return [...new Set(values ?? [])].sort((left, right) => left.localeCompare(right));
+}
+```
+
+Add this method to `MetricflowSourceAdapter`:
+
+```ts
+  async listTargetConnectionIds(_stagedDir: string): Promise<string[]> {
+    return uniqueSorted(this.deps.targetConnectionIds);
+  }
+```
+
+- [ ] **Step 5: Pass primary warehouses from the local adapter factory**
+
+Modify the LookML and MetricFlow adapter construction in
+`packages/context/src/ingest/local-adapters.ts`:
+
+```ts
+    new LookmlSourceAdapter({
+      homeDir: join(project.projectDir, '.ktx/cache'),
+      targetConnectionIds: primaryWarehouseConnectionIds(project),
+    }),
+```
+
+```ts
+    new MetricflowSourceAdapter({
+      homeDir: join(project.projectDir, '.ktx/cache'),
+      targetConnectionIds: primaryWarehouseConnectionIds(project),
+    }),
+```
+
+- [ ] **Step 6: Write the local adapter fan-out test**
+
+Add this test to `packages/context/src/ingest/local-adapters.test.ts`:
+
+```ts
+  it('passes primary warehouse connection ids to local LookML and MetricFlow adapters', async () => {
+    const adapters = createDefaultLocalIngestAdapters(
+      projectWithConnections({
+        warehouse: {
+          driver: 'postgres',
+          url: 'postgresql://readonly@db.example.test/analytics',
+        },
+        lookml_docs: {
+          driver: 'lookml',
+          lookml: {
+            repoUrl: 'https://github.com/acme/lookml.git',
+          },
+        },
+        metrics_repo: {
+          driver: 'metricflow',
+          metricflow: {
+            repoUrl: 'https://github.com/acme/metrics.git',
+          },
+        },
+      } as never),
+    );
+
+    const lookml = adapters.find((adapter) => adapter.source === 'lookml');
+    const metricflow = adapters.find((adapter) => adapter.source === 'metricflow');
+
+    await expect(lookml?.listTargetConnectionIds?.('/tmp/staged-lookml')).resolves.toEqual([
+      'warehouse',
+    ]);
+    await expect(metricflow?.listTargetConnectionIds?.('/tmp/staged-metricflow')).resolves.toEqual([
+      'warehouse',
+    ]);
+  });
+```
+
+- [ ] **Step 7: Run the target fan-out tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run \
+  src/ingest/adapters/lookml/lookml.adapter.test.ts \
+  src/ingest/adapters/metricflow/metricflow.adapter.test.ts \
+  src/ingest/local-adapters.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 8: Commit**
+
+Run:
+
+```bash
+git add \
+  packages/context/src/ingest/adapters/lookml/lookml.adapter.ts \
+  packages/context/src/ingest/adapters/lookml/lookml.adapter.test.ts \
+  packages/context/src/ingest/adapters/metricflow/metricflow.adapter.ts \
+  packages/context/src/ingest/adapters/metricflow/metricflow.adapter.test.ts \
+  packages/context/src/ingest/local-adapters.ts \
+  packages/context/src/ingest/local-adapters.test.ts
+git commit -m "fix(context): expose warehouse targets for LookML and MetricFlow"
+```
+
+### Task 3: Pass full connection config to local ingest SQL execution
+
+**Files:**
+- Modify: `packages/context/src/ingest/local-bundle-runtime.ts`
+- Modify: `packages/context/src/ingest/local-bundle-runtime.test.ts`
+- Modify: `packages/context/src/ingest/local-ingest.ts`
+
+- [ ] **Step 1: Write the failing local connection catalog test**
+
+In `packages/context/src/ingest/local-bundle-runtime.test.ts`, change the
+Vitest import to include `vi`:
+
+```ts
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+```
+
+Extend `RuntimeWithConnectionDeps`:
+
+```ts
+type RuntimeWithConnectionDeps = {
+  deps: {
+    connections: {
+      listEnabledConnections(ids: string[]): Promise<Array<{ id: string; name: string; connectionType: string }>>;
+      getConnectionById(connectionId: string): Promise<{ id: string; name: string; connectionType: string } | null>;
+      executeQuery(connectionId: string, sql: string): Promise<unknown>;
+    };
+  };
+};
+```
+
+Add this test:
+
+```ts
+  it('passes project connection config to local ingest query executors', async () => {
+    const agentRunner = new AgentRunnerService({ llmProvider: { getModel: () => ({}) as never } as any });
+    const queryExecutor = {
+      execute: vi.fn(async () => ({
+        headers: ['answer'],
+        rows: [[1]],
+        totalRows: 1,
+        command: 'SELECT',
+        rowCount: 1,
+      })),
+    };
+
+    const runtime = createLocalBundleIngestRuntime({
+      project,
+      adapters: [new FakeSourceAdapter()],
+      agentRunner,
+      queryExecutor,
+    });
+    const connections = (runtime.runner as unknown as RuntimeWithConnectionDeps).deps.connections;
+
+    await expect(connections.executeQuery('warehouse', 'select 1')).resolves.toMatchObject({
+      headers: ['answer'],
+    });
+    expect(queryExecutor.execute).toHaveBeenCalledWith({
+      connectionId: 'warehouse',
+      projectDir: project.projectDir,
+      connection: project.config.connections.warehouse,
+      sql: 'select 1',
+    });
+  });
+```
+
+- [ ] **Step 2: Run the failing local runtime test**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/local-bundle-runtime.test.ts -t "project connection config"
+```
+
+Expected: FAIL because `LocalConnectionCatalog.executeQuery()` only passes
+`connectionId` and `sql`.
+
+- [ ] **Step 3: Update local ingest query executor types**
+
+In `packages/context/src/ingest/local-bundle-runtime.ts`, import the shared
+query executor type:
+
+```ts
+import { localConnectionInfoFromConfig, type KtxSqlQueryExecutorPort } from '../connections/index.js';
+```
+
+Change `CreateLocalBundleIngestRuntimeOptions.queryExecutor` to:
+
+```ts
+  queryExecutor?: KtxSqlQueryExecutorPort;
+```
+
+Change `LocalConnectionCatalog` to store that type:
+
+```ts
+class LocalConnectionCatalog implements SlConnectionCatalogPort {
+  constructor(
+    private readonly project: KtxLocalProject,
+    private readonly queryExecutor?: KtxSqlQueryExecutorPort,
+  ) {}
+```
+
+Change `executeQuery()`:
+
+```ts
+  async executeQuery(connectionId: string, sql: string): Promise<KtxQueryResult> {
+    if (!this.queryExecutor) {
+      throw new Error('Local ingest has no query executor configured');
+    }
+    return this.queryExecutor.execute({
+      connectionId,
+      projectDir: this.project.projectDir,
+      connection: this.project.config.connections[connectionId],
+      sql,
+    });
+  }
+```
+
+In `packages/context/src/ingest/local-ingest.ts`, replace the local query
+executor object type with the shared port:
+
+```ts
+import type { KtxSqlQueryExecutorPort } from '../connections/index.js';
+```
+
+```ts
+  queryExecutor?: KtxSqlQueryExecutorPort;
+```
+
+- [ ] **Step 4: Run the local runtime test**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/local-bundle-runtime.test.ts -t "project connection config"
+```
+
+Expected: PASS.
+
+- [ ] **Step 5: Commit**
+
+Run:
+
+```bash
+git add \
+  packages/context/src/ingest/local-bundle-runtime.ts \
+  packages/context/src/ingest/local-bundle-runtime.test.ts \
+  packages/context/src/ingest/local-ingest.ts
+git commit -m "fix(context): pass connection config to ingest query executors"
+```
+
+### Task 4: Supply a scan-connector query executor to CLI ingest
+
+**Files:**
+- Create: `packages/cli/src/ingest-query-executor.ts`
+- Create: `packages/cli/src/ingest-query-executor.test.ts`
+- Modify: `packages/cli/src/ingest.ts`
+
+- [ ] **Step 1: Write the CLI query executor tests**
+
+Create `packages/cli/src/ingest-query-executor.test.ts`:
+
+```ts
+import type { KtxLocalProject } from '@ktx/context/project';
+import { createKtxConnectorCapabilities, type KtxScanConnector } from '@ktx/context/scan';
+import { describe, expect, it, vi } from 'vitest';
+import { createKtxCliIngestQueryExecutor } from './ingest-query-executor.js';
+
+function project(): KtxLocalProject {
+  return {
+    projectDir: '/tmp/ktx-query-project',
+    config: {
+      project: 'warehouse',
+      connections: {
+        warehouse: { driver: 'postgres', url: 'postgresql://readonly@example.test/db' },
+      },
+    },
+  } as unknown as KtxLocalProject;
+}
+
+function connector(overrides: Partial<KtxScanConnector> = {}): KtxScanConnector {
+  return {
+    id: 'warehouse',
+    driver: 'postgres',
+    capabilities: createKtxConnectorCapabilities({ readOnlySql: true }),
+    async introspect() {
+      throw new Error('introspect is not used by this test');
+    },
+    executeReadOnly: vi.fn(async () => ({
+      headers: ['answer'],
+      rows: [[1]],
+      totalRows: 1,
+      rowCount: 1,
+    })),
+    cleanup: vi.fn(async () => {}),
+    ...overrides,
+  };
+}
+
+describe('createKtxCliIngestQueryExecutor', () => {
+  it('executes read-only SQL through the scan connector and cleans it up', async () => {
+    const scanConnector = connector();
+    const createConnector = vi.fn(async () => scanConnector);
+    const executor = createKtxCliIngestQueryExecutor(project(), { createConnector });
+
+    await expect(
+      executor.execute({
+        connectionId: 'warehouse',
+        connection: { driver: 'postgres', url: 'postgresql://readonly@example.test/db' },
+        projectDir: '/tmp/ktx-query-project',
+        sql: 'select 1',
+        maxRows: 5,
+      }),
+    ).resolves.toMatchObject({
+      headers: ['answer'],
+      rows: [[1]],
+      totalRows: 1,
+      command: 'SELECT',
+      rowCount: 1,
+    });
+
+    expect(createConnector).toHaveBeenCalledWith(project(), 'warehouse');
+    expect(scanConnector.executeReadOnly).toHaveBeenCalledWith(
+      { connectionId: 'warehouse', sql: 'select 1', maxRows: 5 },
+      { runId: 'ingest-sql-execution' },
+    );
+    expect(scanConnector.cleanup).toHaveBeenCalledTimes(1);
+  });
+
+  it('rejects connectors without read-only SQL support', async () => {
+    const scanConnector = connector({
+      capabilities: createKtxConnectorCapabilities({ readOnlySql: false }),
+      executeReadOnly: undefined,
+    });
+    const executor = createKtxCliIngestQueryExecutor(project(), {
+      createConnector: vi.fn(async () => scanConnector),
+    });
+
+    await expect(
+      executor.execute({
+        connectionId: 'warehouse',
+        connection: { driver: 'postgres' },
+        projectDir: '/tmp/ktx-query-project',
+        sql: 'select 1',
+      }),
+    ).rejects.toThrow('Connection "warehouse" driver "postgres" does not support read-only SQL execution.');
+    expect(scanConnector.cleanup).toHaveBeenCalledTimes(1);
+  });
+});
+```
+
+- [ ] **Step 2: Run the failing CLI query executor test**
+
+Run:
+
+```bash
+pnpm --filter @ktx/cli exec vitest run src/ingest-query-executor.test.ts
+```
+
+Expected: FAIL because `ingest-query-executor.ts` does not exist.
+
+- [ ] **Step 3: Add the scan-connector-backed query executor**
+
+Create `packages/cli/src/ingest-query-executor.ts`:
+
+```ts
+import type { KtxSqlQueryExecutionInput, KtxSqlQueryExecutorPort } from '@ktx/context/connections';
+import type { KtxLocalProject } from '@ktx/context/project';
+import type { KtxScanConnector, KtxScanContext } from '@ktx/context/scan';
+import { createKtxCliScanConnector } from './local-scan-connectors.js';
+
+type CreateConnector = typeof createKtxCliScanConnector;
+
+export interface KtxCliIngestQueryExecutorDeps {
+  createConnector?: CreateConnector;
+}
+
+async function cleanupConnector(connector: KtxScanConnector | null): Promise<void> {
+  await connector?.cleanup?.();
+}
+
+export function createKtxCliIngestQueryExecutor(
+  project: KtxLocalProject,
+  deps: KtxCliIngestQueryExecutorDeps = {},
+): KtxSqlQueryExecutorPort {
+  const createConnector = deps.createConnector ?? createKtxCliScanConnector;
+  return {
+    async execute(input: KtxSqlQueryExecutionInput) {
+      let connector: KtxScanConnector | null = null;
+      try {
+        connector = await createConnector(project, input.connectionId);
+        if (!connector.capabilities.readOnlySql || !connector.executeReadOnly) {
+          throw new Error(
+            `Connection "${input.connectionId}" driver "${connector.driver}" does not support read-only SQL execution.`,
+          );
+        }
+
+        const ctx: KtxScanContext = { runId: 'ingest-sql-execution' };
+        const result = await connector.executeReadOnly(
+          { connectionId: input.connectionId, sql: input.sql, maxRows: input.maxRows },
+          ctx,
+        );
+        return {
+          headers: result.headers,
+          rows: result.rows,
+          totalRows: result.totalRows,
+          command: 'SELECT',
+          rowCount: result.rowCount,
+        };
+      } finally {
+        await cleanupConnector(connector);
+      }
+    },
+  };
+}
+```
+
+- [ ] **Step 4: Wire the CLI executor into local ingest runs**
+
+In `packages/cli/src/ingest.ts`, import the executor and type:
+
+```ts
+import type { KtxSqlQueryExecutorPort } from '@ktx/context/connections';
+import type { KtxLocalProject } from '@ktx/context/project';
+import { createKtxCliIngestQueryExecutor } from './ingest-query-executor.js';
+```
+
+Extend `KtxIngestDeps`:
+
+```ts
+  createQueryExecutor?: (project: KtxLocalProject) => KtxSqlQueryExecutorPort;
+```
+
+Inside the `args.command === 'run'` branch, after `localIngestOptions` is
+defined, add:
+
+```ts
+      const queryExecutor =
+        localIngestOptions.queryExecutor ??
+        (deps.createQueryExecutor ?? createKtxCliIngestQueryExecutor)(project);
+```
+
+Pass `queryExecutor` to both local ingest execution paths. In the Metabase
+fan-out call:
+
+```ts
+          ...localIngestOptions,
+          queryExecutor,
+          trigger: 'manual_resync',
+```
+
+In the normal local ingest call:
+
+```ts
+          ...localIngestOptions,
+          queryExecutor,
+          pullConfigOptions: adapterOptions,
+```
+
+- [ ] **Step 5: Add CLI wiring coverage**
+
+Add this test to `packages/cli/src/ingest.test.ts`:
+
+```ts
+  it('supplies a scan-connector query executor to local ingest runs', async () => {
+    const io = makeIo();
+    const projectDir = join(tempDir, 'query-executor-project');
+    await writeWarehouseConfig(projectDir);
+    const queryExecutor = {
+      execute: vi.fn(async () => ({
+        headers: [],
+        rows: [],
+        totalRows: 0,
+        command: 'SELECT',
+        rowCount: 0,
+      })),
+    };
+    const runLocalIngest = vi.fn(async (input: RunLocalIngestOptions): Promise<LocalIngestResult> =>
+      completedLocalBundleRun(input, 'query-executor-run'),
+    );
+
+    await expect(
+      runKtxIngest(
+        {
+          command: 'run',
+          projectDir,
+          connectionId: 'warehouse',
+          adapter: 'fake',
+          outputMode: 'json',
+        },
+        io.io,
+        {
+          runLocalIngest,
+          createAdapters: () => [],
+          createQueryExecutor: () => queryExecutor,
+        },
+      ),
+    ).resolves.toBe(0);
+
+    expect(runLocalIngest).toHaveBeenCalledWith(expect.objectContaining({ queryExecutor }));
+  });
+```
+
+- [ ] **Step 6: Run CLI query executor tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/cli exec vitest run src/ingest-query-executor.test.ts src/ingest.test.ts -t "query executor"
+```
+
+Expected: PASS.
+
+- [ ] **Step 7: Commit**
+
+Run:
+
+```bash
+git add \
+  packages/cli/src/ingest-query-executor.ts \
+  packages/cli/src/ingest-query-executor.test.ts \
+  packages/cli/src/ingest.ts \
+  packages/cli/src/ingest.test.ts
+git commit -m "fix(cli): enable read-only SQL probes for local ingest"
+```
+
+### Task 5: Final verification
+
+**Files:**
+- Verify: all files changed by Tasks 1-4.
+
+- [ ] **Step 1: Run focused context tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run \
+  src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts \
+  src/ingest/tools/warehouse-verification/entity-details.tool.test.ts \
+  src/ingest/tools/warehouse-verification/discover-data.tool.test.ts \
+  src/ingest/tools/warehouse-verification/sql-execution.tool.test.ts \
+  src/ingest/local-bundle-runtime.test.ts \
+  src/ingest/local-adapters.test.ts \
+  src/ingest/adapters/lookml/lookml.adapter.test.ts \
+  src/ingest/adapters/metricflow/metricflow.adapter.test.ts \
+  src/ingest/ingest-bundle.runner.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 2: Run focused CLI tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/cli exec vitest run src/ingest-query-executor.test.ts src/ingest.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 3: Run type checks**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context run type-check
+pnpm --filter @ktx/cli run type-check
+```
+
+Expected: both commands pass.
+
+- [ ] **Step 4: Run pre-commit on changed files if configured**
+
+Run:
+
+```bash
+uv run pre-commit run --files \
+  packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts \
+  packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts \
+  packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts \
+  packages/context/src/ingest/adapters/lookml/lookml.adapter.ts \
+  packages/context/src/ingest/adapters/lookml/lookml.adapter.test.ts \
+  packages/context/src/ingest/adapters/metricflow/metricflow.adapter.ts \
+  packages/context/src/ingest/adapters/metricflow/metricflow.adapter.test.ts \
+  packages/context/src/ingest/local-adapters.ts \
+  packages/context/src/ingest/local-adapters.test.ts \
+  packages/context/src/ingest/local-bundle-runtime.ts \
+  packages/context/src/ingest/local-bundle-runtime.test.ts \
+  packages/context/src/ingest/local-ingest.ts \
+  packages/cli/src/ingest-query-executor.ts \
+  packages/cli/src/ingest-query-executor.test.ts \
+  packages/cli/src/ingest.ts \
+  packages/cli/src/ingest.test.ts \
+  docs/superpowers/plans/2026-05-12-warehouse-verification-final-v1-closure.md
+```
+
+Expected: PASS. If the repository has no pre-commit config or the local `uv`
+version cannot satisfy the configured toolchain, record the exact error and use
+the focused test and type-check results as the closest verification.
+
+- [ ] **Step 5: Commit final verification fixes if any were needed**
+
+If verification required edits, run:
+
+```bash
+git add <changed-files>
+git commit -m "test: cover warehouse verification v1 closure"
+```
+
+If verification required no edits, do not create an empty commit.
+
+## Self-review
+
+Spec coverage:
+
+- Raw warehouse discovery still covers wiki, semantic-layer, and raw schema
+  results, and now raw hits include the connection name needed by the required
+  `entity_details` follow-up.
+- Every local synthesis adapter with an external source connection now has a
+  path to target warehouse IDs: dbt and Notion already had it, Looker resolves
+  staged mappings, Metabase fan-out runs under target warehouse IDs, and this
+  plan adds LookML and MetricFlow.
+- `sql_execution` remains scoped by `allowedConnectionNames`, retains the
+  read-only SQL wrapper, and gains a normal local ingest execution backend.
+
+Placeholder scan:
+
+- This plan contains no deferred implementation placeholders.
+- Every code-changing step includes the exact test or implementation snippet to
+  add.
+
+Type consistency:
+
+- `connectionName` is added to `RawSchemaHit` and used by `DiscoverDataTool`.
+- `targetConnectionIds` and `listTargetConnectionIds()` match the existing dbt
+  and Notion adapter pattern.
+- Local ingest uses `KtxSqlQueryExecutorPort` consistently from CLI to context.

docs/superpowers/plans/2026-05-13-warehouse-verification-prompt-shape-closure.md

@@ -0,0 +1,345 @@
+# Warehouse Verification Prompt Shape Closure Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Make every warehouse-verification prompt use KTX's shipped
+`sql_execution` input shape so ingest agents include `connectionName` when they
+probe warehouse identifiers.
+
+**Architecture:** Keep the warehouse verification tool code unchanged. Add
+prompt-asset tests that reject Kaelio's old session-only SQL examples, then
+update the shared identifier protocol and the three remaining per-skill SQL
+probe examples that still show the legacy shape.
+
+**Tech Stack:** Markdown skill prompts, TypeScript, Vitest, pnpm workspace
+commands.
+
+---
+
+## Audit Summary
+
+The warehouse verification tools, runner wiring, adapter target fan-out, and
+focused tests are present. Focused verification passed:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/connections/dialects.test.ts src/connections/read-only-sql.test.ts src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts src/ingest/tools/warehouse-verification/entity-details.tool.test.ts src/ingest/tools/warehouse-verification/sql-execution.tool.test.ts src/ingest/tools/warehouse-verification/discover-data.tool.test.ts src/ingest/ingest-prompts.test.ts src/ingest/ingest-runtime-assets.test.ts src/memory/memory-runtime-assets.test.ts src/ingest/local-adapters.test.ts src/ingest/adapters/notion/notion.adapter.test.ts src/ingest/adapters/lookml/lookml.adapter.test.ts src/ingest/adapters/metricflow/metricflow.adapter.test.ts
+pnpm --filter @ktx/cli exec vitest run src/ingest-query-executor.test.ts src/ingest.test.ts -t "supplies a scan-connector query executor"
+```
+
+Remaining v1-blocking gap:
+
+- `packages/context/skills/lookml_ingest/SKILL.md`,
+  `packages/context/skills/metricflow_ingest/SKILL.md`, and
+  `packages/context/skills/sl_capture/SKILL.md` still contain
+  `sql_execution({ sql ... })` / "session shape" guidance inherited from
+  Kaelio. KTX's tool contract is
+  `sql_execution({connectionName, sql, rowLimit?})`, so these examples can make
+  agents call the shipped tool with invalid input.
+
+Non-blocking gaps remain out of scope for this v1 plan:
+
+- Full DDL-style `entity_details` formatting with FK profile summaries.
+- AST-backed SQL validation for data-modifying CTE bodies.
+- Search over generated `enrichment/descriptions.json`.
+- Per-WorkUnit reuse of a single `WarehouseCatalogService` instance for cache
+  hits across separate tool calls.
+- A deterministic fake-LLM end-to-end Notion hallucination regression. Prompt
+  guards and tool contract tests cover the v1 contract; a broader behavior
+  regression can land as follow-up.
+
+## File Structure
+
+Modify these files:
+
+- `packages/context/src/memory/memory-runtime-assets.test.ts`: add a prompt
+  guard that rejects the legacy session-only `sql_execution` shape.
+- `packages/context/src/ingest/ingest-runtime-assets.test.ts`: strengthen the
+  shared prompt asset assertion for the KTX `connectionName` SQL shape.
+- `packages/context/skills/_shared/identifier-verification.md`: make both SQL
+  probe instructions show the KTX `connectionName` argument.
+- `packages/context/skills/notion_synthesize/SKILL.md`: inline the updated
+  protocol block.
+- `packages/context/skills/dbt_ingest/SKILL.md`: inline the updated protocol
+  block.
+- `packages/context/skills/lookml_ingest/SKILL.md`: inline the updated protocol
+  block and fix the legacy SQL fallback example.
+- `packages/context/skills/looker_ingest/SKILL.md`: inline the updated
+  protocol block.
+- `packages/context/skills/metabase_ingest/SKILL.md`: inline the updated
+  protocol block.
+- `packages/context/skills/metricflow_ingest/SKILL.md`: inline the updated
+  protocol block and fix the legacy SQL fallback example.
+- `packages/context/skills/live_database_ingest/SKILL.md`: inline the updated
+  protocol block.
+- `packages/context/skills/historic_sql_table_digest/SKILL.md`: inline the
+  updated protocol block.
+- `packages/context/skills/historic_sql_patterns/SKILL.md`: inline the updated
+  protocol block.
+- `packages/context/skills/knowledge_capture/SKILL.md`: inline the updated
+  protocol block.
+- `packages/context/skills/sl_capture/SKILL.md`: inline the updated protocol
+  block and fix the join-discovery SQL example.
+
+### Task 1: Add Prompt Guards For The KTX SQL Tool Shape
+
+**Files:**
+- Modify: `packages/context/src/memory/memory-runtime-assets.test.ts`
+- Modify: `packages/context/src/ingest/ingest-runtime-assets.test.ts`
+
+- [ ] **Step 1: Add the failing memory asset guard**
+
+In `packages/context/src/memory/memory-runtime-assets.test.ts`, add this test
+after `does not ship stale warehouse verification tool names or fictional
+identifiers`:
+
+```ts
+  it('ships only the KTX connectionName sql_execution call shape in writer guidance', async () => {
+    const shared = await readFile(join(skillsDir, '_shared', 'identifier-verification.md'), 'utf-8');
+
+    expect(shared).toContain('sql_execution({connectionName, sql: "SELECT DISTINCT');
+    expect(shared).toContain('sql_execution({connectionName, sql: "SELECT 1 FROM');
+
+    for (const skillName of verificationWriterSkills) {
+      const body = await readFile(join(skillsDir, skillName, 'SKILL.md'), 'utf-8');
+      expect(body).toContain('sql_execution({connectionName');
+      expect(body).not.toContain('sql_execution({ sql');
+      expect(body).not.toContain('session shape');
+      expect(body).not.toContain('connection is already pinned by the ingest session');
+    }
+  });
+```
+
+- [ ] **Step 2: Strengthen the shared ingest asset guard**
+
+In `packages/context/src/ingest/ingest-runtime-assets.test.ts`, update
+`packages identifier verification prompt assets` so the final assertions are:
+
+```ts
+    expect(shared).toContain('discover_data');
+    expect(shared).toContain('entity_details');
+    expect(shared).toContain('sql_execution');
+    expect(shared).toContain('sql_execution({connectionName, sql: "SELECT DISTINCT');
+    expect(shared).toContain('sql_execution({connectionName, sql: "SELECT 1 FROM');
+```
+
+- [ ] **Step 3: Run the failing prompt guards**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/memory/memory-runtime-assets.test.ts src/ingest/ingest-runtime-assets.test.ts
+```
+
+Expected: FAIL. The failure must mention at least one current legacy string:
+`sql_execution({ sql`, `session shape`, or missing
+`sql_execution({connectionName`.
+
+### Task 2: Update The Shared Identifier Verification Protocol
+
+**Files:**
+- Modify: `packages/context/skills/_shared/identifier-verification.md`
+- Modify: `packages/context/skills/notion_synthesize/SKILL.md`
+- Modify: `packages/context/skills/dbt_ingest/SKILL.md`
+- Modify: `packages/context/skills/lookml_ingest/SKILL.md`
+- Modify: `packages/context/skills/looker_ingest/SKILL.md`
+- Modify: `packages/context/skills/metabase_ingest/SKILL.md`
+- Modify: `packages/context/skills/metricflow_ingest/SKILL.md`
+- Modify: `packages/context/skills/live_database_ingest/SKILL.md`
+- Modify: `packages/context/skills/historic_sql_table_digest/SKILL.md`
+- Modify: `packages/context/skills/historic_sql_patterns/SKILL.md`
+- Modify: `packages/context/skills/knowledge_capture/SKILL.md`
+- Modify: `packages/context/skills/sl_capture/SKILL.md`
+
+- [ ] **Step 1: Replace the shared protocol text**
+
+Replace the full `## Identifier Verification Protocol` block in
+`packages/context/skills/_shared/identifier-verification.md` with:
+
+```md
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+```
+
+- [ ] **Step 2: Inline the same protocol in every writer skill**
+
+Replace the existing `## Identifier Verification Protocol` block in each writer
+skill with the exact block from Step 1:
+
+```bash
+packages/context/skills/notion_synthesize/SKILL.md
+packages/context/skills/dbt_ingest/SKILL.md
+packages/context/skills/lookml_ingest/SKILL.md
+packages/context/skills/looker_ingest/SKILL.md
+packages/context/skills/metabase_ingest/SKILL.md
+packages/context/skills/metricflow_ingest/SKILL.md
+packages/context/skills/live_database_ingest/SKILL.md
+packages/context/skills/historic_sql_table_digest/SKILL.md
+packages/context/skills/historic_sql_patterns/SKILL.md
+packages/context/skills/knowledge_capture/SKILL.md
+packages/context/skills/sl_capture/SKILL.md
+```
+
+- [ ] **Step 3: Run the shared prompt asset tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/memory/memory-runtime-assets.test.ts src/ingest/ingest-runtime-assets.test.ts
+```
+
+Expected: still FAIL because the per-skill legacy SQL examples in LookML,
+MetricFlow, and `sl_capture` have not been fixed yet.
+
+### Task 3: Fix Legacy Per-Skill SQL Examples
+
+**Files:**
+- Modify: `packages/context/skills/lookml_ingest/SKILL.md`
+- Modify: `packages/context/skills/metricflow_ingest/SKILL.md`
+- Modify: `packages/context/skills/sl_capture/SKILL.md`
+
+- [ ] **Step 1: Fix the LookML fallback probe example**
+
+In `packages/context/skills/lookml_ingest/SKILL.md`, replace the current
+Required flow item 2 with:
+
+```md
+2. If the table isn't in the manifest, use the warehouse `connectionName`
+   returned by `discover_data` or the target connection chosen from
+   `sl_discover`, then call a dialect-appropriate SQL probe with that
+   connection name, for example:
+   `sql_execution({connectionName: "warehouse", sql: "SELECT 1 FROM analytics.orders LIMIT 0"})`.
+   Replace `warehouse`, `analytics`, and `orders` with the verified connection,
+   schema or dataset, and table from the WorkUnit evidence.
+```
+
+- [ ] **Step 2: Fix the MetricFlow fallback probe example**
+
+In `packages/context/skills/metricflow_ingest/SKILL.md`, replace the paragraph
+that begins `If \`sl_discover\` errors` with:
+
+```md
+If `sl_discover` errors because no such table exists, use `discover_data` and
+`entity_details` to find the warehouse target. If a SQL probe is still needed,
+call `sql_execution` with the same warehouse connection name, for example:
+`sql_execution({connectionName: "warehouse", sql: "SELECT 1 FROM analytics.orders LIMIT 0"})`.
+**Never invent column names** - every column in `columns:`, `grain:`, and
+`sql:` must be sourced from raw files, `entity_details`, or a successful SQL
+probe.
+```
+
+- [ ] **Step 3: Fix the `sl_capture` join probe example**
+
+In `packages/context/skills/sl_capture/SKILL.md`, replace Tool sequence item 6
+with:
+
+```md
+6. For join discovery: use `sql_execution({connectionName: "warehouse", sql: "SELECT count(*) FROM public.orders o JOIN public.customers c ON c.id = o.customer_id LIMIT 20"})` with the target warehouse connection name and dialect-correct table names to verify the join key exists in both tables and assess cardinality before declaring the join.
+```
+
+- [ ] **Step 4: Run the prompt asset tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/memory/memory-runtime-assets.test.ts src/ingest/ingest-runtime-assets.test.ts
+```
+
+Expected: PASS. The tests must report 2 files passed.
+
+### Task 4: Final Verification
+
+**Files:**
+- No new files.
+
+- [ ] **Step 1: Run focused warehouse prompt and tool tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/connections/dialects.test.ts src/connections/read-only-sql.test.ts src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts src/ingest/tools/warehouse-verification/entity-details.tool.test.ts src/ingest/tools/warehouse-verification/sql-execution.tool.test.ts src/ingest/tools/warehouse-verification/discover-data.tool.test.ts src/ingest/ingest-prompts.test.ts src/ingest/ingest-runtime-assets.test.ts src/memory/memory-runtime-assets.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 2: Run package type-check**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context run type-check
+```
+
+Expected: PASS.
+
+- [ ] **Step 3: Inspect final diff**
+
+Run:
+
+```bash
+git diff -- packages/context/src/memory/memory-runtime-assets.test.ts packages/context/src/ingest/ingest-runtime-assets.test.ts packages/context/skills/_shared/identifier-verification.md packages/context/skills/notion_synthesize/SKILL.md packages/context/skills/dbt_ingest/SKILL.md packages/context/skills/lookml_ingest/SKILL.md packages/context/skills/looker_ingest/SKILL.md packages/context/skills/metabase_ingest/SKILL.md packages/context/skills/metricflow_ingest/SKILL.md packages/context/skills/live_database_ingest/SKILL.md packages/context/skills/historic_sql_table_digest/SKILL.md packages/context/skills/historic_sql_patterns/SKILL.md packages/context/skills/knowledge_capture/SKILL.md packages/context/skills/sl_capture/SKILL.md
+```
+
+Expected: only prompt wording and prompt-asset guards changed. No tool
+implementation files changed.
+
+- [ ] **Step 4: Commit**
+
+Run:
+
+```bash
+git add packages/context/src/memory/memory-runtime-assets.test.ts packages/context/src/ingest/ingest-runtime-assets.test.ts packages/context/skills/_shared/identifier-verification.md packages/context/skills/notion_synthesize/SKILL.md packages/context/skills/dbt_ingest/SKILL.md packages/context/skills/lookml_ingest/SKILL.md packages/context/skills/looker_ingest/SKILL.md packages/context/skills/metabase_ingest/SKILL.md packages/context/skills/metricflow_ingest/SKILL.md packages/context/skills/live_database_ingest/SKILL.md packages/context/skills/historic_sql_table_digest/SKILL.md packages/context/skills/historic_sql_patterns/SKILL.md packages/context/skills/knowledge_capture/SKILL.md packages/context/skills/sl_capture/SKILL.md
+git commit -m "fix(context): align warehouse sql probe prompt shape"
+```
+
+Expected: one focused commit.
+
+## Self-Review
+
+Spec coverage:
+
+- The original spec requires `sql_execution` inputs to include
+  `connectionName`; this plan removes contradictory session-only examples from
+  all active writer guidance.
+- The shared protocol remains in `_shared` and inlined in every synthesis
+  writer skill named by the original spec.
+- The tool implementation remains unchanged because the shipped schema already
+  enforces the v1 contract.
+
+Placeholder scan:
+
+- The plan has no deferred implementation markers.
+- Prompt examples use concrete `warehouse`, `analytics`, and `orders` example
+  names only to demonstrate JSON shape, and each example tells the worker to
+  replace them with discovered evidence.
+
+Type consistency:
+
+- Tests assert the exact KTX tool call shape:
+  `sql_execution({connectionName, sql: ...})`.
+- Prompt wording consistently uses `connectionName`, matching
+  `packages/context/src/ingest/tools/warehouse-verification/sql-execution.tool.ts`.

docs/superpowers/plans/2026-05-13-warehouse-verification-sql-example-closure.md

@@ -0,0 +1,215 @@
+# Warehouse Verification SQL Example Closure Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Remove the last connectionless `sql_execution` prompt example so
+warehouse-verification writer guidance always matches KTX's shipped tool
+contract.
+
+**Architecture:** Keep the warehouse verification tool code unchanged. Tighten
+the prompt asset guard so multiline `sql_execution({ sql: ... })` examples
+fail tests, then update the stale `sl_capture` worked example to pass
+`connectionName` explicitly.
+
+**Tech Stack:** Markdown skill prompts, TypeScript, Vitest, pnpm workspace
+commands.
+
+---
+
+## Audit summary
+
+The warehouse verification tools, runner wiring, source-adapter target fan-out,
+CLI query executor, and focused tests are present. Focused verification passed:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/connections/dialects.test.ts src/connections/read-only-sql.test.ts src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts src/ingest/tools/warehouse-verification/entity-details.tool.test.ts src/ingest/tools/warehouse-verification/sql-execution.tool.test.ts src/ingest/tools/warehouse-verification/discover-data.tool.test.ts src/ingest/ingest-prompts.test.ts src/ingest/ingest-runtime-assets.test.ts src/memory/memory-runtime-assets.test.ts src/ingest/local-adapters.test.ts src/ingest/adapters/notion/notion.adapter.test.ts src/ingest/adapters/lookml/lookml.adapter.test.ts src/ingest/adapters/metricflow/metricflow.adapter.test.ts
+pnpm --filter @ktx/cli exec vitest run src/ingest-query-executor.test.ts src/ingest.test.ts -t "supplies a scan-connector query executor"
+```
+
+Remaining v1-blocking gap:
+
+- `packages/context/skills/sl_capture/SKILL.md` still contains a worked example
+  with a multiline `sql_execution({ sql: ... })` call. KTX's tool contract is
+  `sql_execution({connectionName, sql, rowLimit?})`, so this example can teach
+  agents to call the shipped tool with invalid input.
+
+Non-blocking gaps remain out of scope for this v1 plan:
+
+- Full DDL-style `entity_details` formatting with FK profile summaries.
+- AST-backed SQL validation for data-modifying CTE bodies.
+- Search over generated `enrichment/descriptions.json`.
+- Per-WorkUnit reuse of a single `WarehouseCatalogService` instance for cache
+  hits across separate tool calls.
+- A deterministic fake-LLM end-to-end Notion hallucination regression.
+- Tokenized or embedding-backed raw schema search ranking in `discover_data`.
+
+## File structure
+
+Modify these files:
+
+- `packages/context/src/memory/memory-runtime-assets.test.ts`: add a prompt
+  guard that catches multiline `sql_execution` calls without `connectionName`.
+- `packages/context/skills/sl_capture/SKILL.md`: update the stale worked
+  example to include the target warehouse `connectionName`.
+
+### Task 1: Add a multiline SQL prompt guard
+
+**Files:**
+- Modify: `packages/context/src/memory/memory-runtime-assets.test.ts`
+
+- [ ] **Step 1: Add a helper that extracts `sql_execution` call examples**
+
+In `packages/context/src/memory/memory-runtime-assets.test.ts`, add this helper
+after `forbiddenProductPattern()`:
+
+```ts
+function sqlExecutionCallBlocks(body: string): string[] {
+  const blocks: string[] = [];
+  const marker = 'sql_execution({';
+  let offset = 0;
+
+  while (offset < body.length) {
+    const start = body.indexOf(marker, offset);
+    if (start === -1) {
+      break;
+    }
+    const end = body.indexOf('})', start + marker.length);
+    blocks.push(body.slice(start, end === -1 ? start + marker.length : end + 2));
+    offset = start + marker.length;
+  }
+
+  return blocks;
+}
+```
+
+- [ ] **Step 2: Strengthen the existing SQL-shape test**
+
+Replace the body of
+`ships only the KTX connectionName sql_execution call shape in writer guidance`
+with:
+
+```ts
+    const shared = await readFile(join(skillsDir, '_shared', 'identifier-verification.md'), 'utf-8');
+    const bodies = [{ name: '_shared/identifier-verification.md', body: shared }];
+
+    expect(shared).toContain('sql_execution({connectionName, sql: "SELECT DISTINCT');
+    expect(shared).toContain('sql_execution({connectionName, sql: "SELECT 1 FROM');
+
+    for (const skillName of verificationWriterSkills) {
+      const body = await readFile(join(skillsDir, skillName, 'SKILL.md'), 'utf-8');
+      bodies.push({ name: `${skillName}/SKILL.md`, body });
+      expect(body).toContain('sql_execution({connectionName');
+      expect(body).not.toContain('sql_execution({ sql');
+      expect(body).not.toContain('session shape');
+      expect(body).not.toContain('connection is already pinned by the ingest session');
+    }
+
+    for (const { name, body } of bodies) {
+      const calls = sqlExecutionCallBlocks(body);
+      expect(calls.length, `${name} should contain sql_execution guidance`).toBeGreaterThan(0);
+      expect(
+        calls.filter((call) => !call.includes('connectionName')),
+        `${name} has sql_execution calls without connectionName`,
+      ).toEqual([]);
+      expect(body, `${name} has a connectionless multiline sql_execution call`).not.toMatch(
+        /sql_execution\(\{\s*sql\s*:/,
+      );
+    }
+```
+
+- [ ] **Step 3: Run the failing prompt guard**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/memory/memory-runtime-assets.test.ts -t "connectionName sql_execution"
+```
+
+Expected: FAIL. The failure must identify
+`sl_capture/SKILL.md` as having a `sql_execution` call without
+`connectionName` or a connectionless multiline `sql_execution` call.
+
+- [ ] **Step 4: Commit the failing guard**
+
+Run:
+
+```bash
+git add packages/context/src/memory/memory-runtime-assets.test.ts
+git commit -m "test(context): catch connectionless sql execution prompt examples"
+```
+
+### Task 2: Fix the stale `sl_capture` SQL example
+
+**Files:**
+- Modify: `packages/context/skills/sl_capture/SKILL.md`
+- Test: `packages/context/src/memory/memory-runtime-assets.test.ts`
+- Test: `packages/context/src/ingest/ingest-runtime-assets.test.ts`
+
+- [ ] **Step 1: Update the worked example**
+
+In `packages/context/skills/sl_capture/SKILL.md`, replace the `sql_execution`
+block in "Worked example - new join" with:
+
+```md
+sql_execution({
+  connectionName: "warehouse",
+  sql: "SELECT COUNT(*), COUNT(DISTINCT a.admin_user_id) FROM public.fct_orders a JOIN public.fct_mau_multiprotocol b ON a.admin_user_id = b.admin_user_id LIMIT 1"
+})
+```
+
+- [ ] **Step 2: Run the prompt guards**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/memory/memory-runtime-assets.test.ts src/ingest/ingest-runtime-assets.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 3: Run a direct stale-shape scan**
+
+Run:
+
+```bash
+rg -n -U "sql_execution\\(\\{\\s*\\n\\s*sql:" packages/context/skills packages/context/prompts
+```
+
+Expected: no matches and exit code 1.
+
+- [ ] **Step 4: Run the context type-check**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context run type-check
+```
+
+Expected: PASS.
+
+- [ ] **Step 5: Commit the prompt fix**
+
+Run:
+
+```bash
+git add packages/context/skills/sl_capture/SKILL.md
+git commit -m "fix(context): include connection name in sl capture sql example"
+```
+
+## Self-review
+
+Spec coverage:
+
+- The only remaining v1-blocking prompt-shape gap has a failing test and a
+  direct prompt edit.
+- Tool implementation, runner wiring, adapter scoping, and CLI execution
+  remain covered by the focused suites listed in the audit summary.
+
+Placeholder scan:
+
+- This plan contains no deferred implementation placeholders.
+
+Type consistency:
+
+- The plan uses the shipped KTX tool shape:
+  `sql_execution({connectionName, sql, rowLimit?})`.

docs/superpowers/plans/2026-05-13-warehouse-verification-structured-target-miss-closure.md

@@ -0,0 +1,236 @@
+# Warehouse Verification Structured Target Miss Closure Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Make `entity_details` return model-visible not-found evidence for every documented target shape, including structured `{catalog, db, name, column?}` targets.
+
+**Architecture:** Keep the existing warehouse verification module. Add focused tests for missing structured table and column targets, then route structured target labels through the same candidate lookup used by display targets while preserving exact structured resolution.
+
+**Tech Stack:** TypeScript, Node 22, Vitest, AI SDK v6 tools, Zod, KTX ingest tools.
+
+---
+
+## Audit Summary
+
+The implemented plans have landed the warehouse verification tools, ingest
+runner wiring, adapter warehouse target fan-out, CLI read-only query executor,
+and prompt-shape closures. Focused verification passed on May 13, 2026:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/connections/dialects.test.ts src/connections/read-only-sql.test.ts src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts src/ingest/tools/warehouse-verification/entity-details.tool.test.ts src/ingest/tools/warehouse-verification/sql-execution.tool.test.ts src/ingest/tools/warehouse-verification/discover-data.tool.test.ts src/ingest/ingest-prompts.test.ts src/ingest/ingest-runtime-assets.test.ts src/memory/memory-runtime-assets.test.ts src/ingest/local-adapters.test.ts src/ingest/adapters/notion/notion.adapter.test.ts src/ingest/adapters/lookml/lookml.adapter.test.ts src/ingest/adapters/metricflow/metricflow.adapter.test.ts
+pnpm --filter @ktx/cli exec vitest run src/ingest-query-executor.test.ts src/ingest.test.ts -t "supplies a scan-connector query executor"
+rg -n -U "sql_execution\\(\\{\\s*\\n\\s*sql:" packages/context/skills packages/context/prompts
+rg -n "wiki_sl_search|sl_describe_table|orbit_analytics\\.customer" packages/context/skills packages/context/prompts packages/context/src/ingest/tools/emit-unmapped-fallback.tool.ts packages/context/src/sl/tools/sl-warehouse-validation.ts
+```
+
+Remaining v1-blocking gap:
+
+- `entity_details` accepts structured targets, but if a structured table target
+  does not exist, it records `structured.missing` and emits no markdown. Tool
+  outputs are sent to the model as markdown only, so the synthesis agent gets
+  an empty response instead of the required "Not found in scan" verification
+  signal.
+
+Non-blocking gaps remain out of scope for this v1 plan:
+
+- Full DDL-style `entity_details` formatting with FK and profile summaries.
+- AST-backed SQL validation for data-modifying CTE bodies.
+- Dialect-specific row-limit wrapping for SQL Server probes.
+- Search over generated `enrichment/descriptions.json`.
+- Per-WorkUnit reuse of a single `WarehouseCatalogService` instance for cache
+  hits across separate tool calls.
+- A deterministic fake-LLM end-to-end Notion hallucination regression.
+- Cleanup of legacy demo Orbit wiki fixtures that still mention
+  `orbit_analytics.customer`.
+
+## File Structure
+
+Modify these files:
+
+- `packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.test.ts`: add failing coverage for missing structured targets.
+- `packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.ts`: render missing structured targets into markdown and reuse candidate lookup.
+
+### Task 1: Report Structured Target Misses In `entity_details`
+
+**Files:**
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.test.ts`
+- Modify: `packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.ts`
+
+- [ ] **Step 1: Add failing structured miss tests**
+
+In `packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.test.ts`, add these tests after `reports missing explicit columns instead of returning an empty column list`:
+
+```ts
+  it('reports missing structured table targets in model-visible markdown', async () => {
+    const result = await tool.call(
+      {
+        connectionName: 'warehouse',
+        targets: [{ catalog: null, db: 'public', name: 'orderz' }],
+      },
+      context,
+    );
+
+    expect(result.markdown).toContain('Not found in scan: public.orderz');
+    expect(result.markdown).toContain('Closest matches: orders');
+    expect(result.structured.resolved).toHaveLength(0);
+    expect(result.structured.missing).toHaveLength(1);
+  });
+
+  it('reports missing structured column targets in model-visible markdown', async () => {
+    const result = await tool.call(
+      {
+        connectionName: 'warehouse',
+        targets: [{ catalog: null, db: 'public', name: 'orders', column: 'plan_tier' }],
+      },
+      context,
+    );
+
+    expect(result.markdown).toContain('Column not found in scan: public.orders.plan_tier');
+    expect(result.markdown).toContain('Available columns: id, status');
+    expect(result.structured.resolved).toHaveLength(0);
+    expect(result.structured.missing).toHaveLength(1);
+  });
+```
+
+- [ ] **Step 2: Run the failing focused test**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/tools/warehouse-verification/entity-details.tool.test.ts -t "structured"
+```
+
+Expected: FAIL. The first new test must fail because `result.markdown` does not contain `Not found in scan: public.orderz`.
+
+- [ ] **Step 3: Add structured target labels and candidate lookup**
+
+In `packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.ts`, add this type alias after `type EntityDetailsInput = z.infer<typeof entityDetailsInputSchema>;`:
+
+```ts
+type EntityDetailsTarget = EntityDetailsInput['targets'][number];
+```
+
+Add these helpers after `function allowedConnectionNames(context: ToolContext): ReadonlySet<string> | null { ... }`:
+
+```ts
+function targetLabel(target: EntityDetailsTarget): string {
+  if ('display' in target) {
+    return target.display;
+  }
+  return [target.catalog, target.db, target.name, target.column].filter((part): part is string => !!part).join('.');
+}
+
+function appendMissingTargetMarkdown(parts: string[], target: EntityDetailsTarget, candidates: KtxTableRef[]): void {
+  parts.push(`Not found in scan: ${targetLabel(target)}`);
+  if (candidates.length > 0) {
+    parts.push(`Closest matches: ${candidates.map((candidate) => candidate.name).join(', ')}`);
+  }
+}
+
+async function resolveTarget(
+  catalog: WarehouseCatalogService,
+  connectionName: string,
+  target: EntityDetailsTarget,
+): Promise<{ resolved: (KtxTableRef & { column?: string }) | null; candidates: KtxTableRef[] }> {
+  if ('display' in target) {
+    return catalog.resolveDisplayTarget(connectionName, target.display);
+  }
+
+  const candidateResolution = await catalog.resolveDisplayTarget(connectionName, targetLabel(target));
+  return {
+    resolved: {
+      catalog: target.catalog,
+      db: target.db,
+      name: target.name,
+      column: target.column,
+    },
+    candidates: candidateResolution.candidates,
+  };
+}
+```
+
+Then replace the `const resolution = ...` block inside the `for (const target of input.targets)` loop with:
+
+```ts
+      const resolution = await resolveTarget(catalog, input.connectionName, target);
+```
+
+Replace the missing-resolution block with:
+
+```ts
+      if (!resolution.resolved) {
+        missing.push({ target, candidates: resolution.candidates });
+        appendMissingTargetMarkdown(parts, target, resolution.candidates);
+        continue;
+      }
+```
+
+Replace the missing-detail block with:
+
+```ts
+      if (!detail) {
+        missing.push({ target, candidates: resolution.candidates });
+        appendMissingTargetMarkdown(parts, target, resolution.candidates);
+        continue;
+      }
+```
+
+- [ ] **Step 4: Run the focused entity-details tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/tools/warehouse-verification/entity-details.tool.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 5: Run warehouse verification regression tests**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context exec vitest run src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts src/ingest/tools/warehouse-verification/entity-details.tool.test.ts src/ingest/tools/warehouse-verification/discover-data.tool.test.ts
+```
+
+Expected: PASS.
+
+- [ ] **Step 6: Run context type-check**
+
+Run:
+
+```bash
+pnpm --filter @ktx/context run type-check
+```
+
+Expected: PASS.
+
+- [ ] **Step 7: Commit**
+
+Run:
+
+```bash
+git add \
+  packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.ts \
+  packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.test.ts
+git commit -m "fix(context): report structured entity detail misses"
+```
+
+## Self-review
+
+Spec coverage:
+
+- The original `entity_details` contract says structured and display targets
+  are mixed shapes and unresolved targets must produce `Not found in scan` with
+  candidates. This plan adds that model-visible behavior for structured table
+  misses and preserves the existing column-miss behavior.
+
+Placeholder scan:
+
+- This plan contains no deferred implementation placeholders.
+
+Type consistency:
+
+- The plan uses the existing `WarehouseCatalogService`, `KtxTableRef`,
+  `EntityDetailsStructured`, and `ToolOutput` types without adding public API
+  compatibility wrappers.

docs/superpowers/specs/2026-05-12-notion-ingestion-warehouse-verification-design.md

@@ -0,0 +1,331 @@
+# Warehouse Verification Tools for Ingestion Synthesis
+
+**Date:** 2026-05-12
+**Author:** Andrey Avtomonov
+**Status:** Design — pending implementation plan
+
+## Background and motivation
+
+KTX's ingest pipeline synthesises wiki pages and semantic-layer (SL) sources from third-party content (Notion, LookML, Looker, Metabase, dbt, MetricFlow, historic SQL, live-database scans, and chat). The synthesis stage is an LLM call that runs once per WorkUnit, governed by a skill prompt (e.g. `notion_synthesize`) and a set of allowed tools.
+
+A real-world inspection (project `/tmp/ktx-proj-1`) surfaced two failure modes the synthesis stage produces:
+
+1. **Fictional identifiers laundered into wiki output.** A Notion page mentioned `orbit_analytics.customer` as a legacy "customer source" table with a `plan_tier in {free, pro, enterprise}` column. Neither the table, the column, nor those values exist in the configured warehouse. The synthesis LLM faithfully copied them into `knowledge/global/orbit/customers-source.md` as a "Conflict Note", giving the fabricated names full wiki frontmatter, a `Source:` citation, and apparent authority.
+2. **Column attribution drift.** The same wiki page documents columns under `orbit_raw.accounts` but states the `paying_account_count` measure filters on `normalized_plan_code` and `contract_status`. Those columns live on `orbit_analytics.mart_account_segments`, not on `accounts`. A reader (or a downstream agent) following the page will write `accounts.normalized_plan_code` and get a `column does not exist` error.
+
+Root cause analysis (`packages/context/skills/notion_synthesize/SKILL.md`, `packages/context/src/ingest/tools/emit-unmapped-fallback.tool.ts`, `packages/context/src/wiki/tools/wiki-write.tool.ts`) showed three contributing factors:
+
+- The synthesis LLM has no verification primitive that distinguishes a real warehouse identifier from a fabricated one. `sl_discover` only finds objects already promoted into the semantic layer; raw warehouse scans (which already exist on disk under `raw-sources/<conn>/live-database/<sync>/`) are not surfaced to the LLM at all.
+- `wiki_write` performs no body-text validation — anything the LLM emits is written.
+- The skill prompt itself uses `orbit_analytics.customer` as a canonical example string (`SKILL.md:70`), reinforcing the same fictional name the LLM ends up emitting.
+
+Kaelio's server-side ingest WU agent (`/Users/andrey/conductor/workspaces/kaelio-main2/douala/server/src/tools/toolset-factory.service.ts`) had four verification tools that KTX dropped during the open-source extraction: `discover_data`, `entity_details`, `dictionary_search`, and `sql_execution`. The underlying connector infrastructure (`KtxScanConnector`, dialect classes, `assertReadOnlySql`, `SemanticLayerService.executeQuery`) is present in KTX, so the gap is at the tool layer, not the platform layer.
+
+## Goal
+
+Give every ingest adapter's synthesis-time LLM call the tools and skill-prompt instructions needed to verify warehouse identifiers (`schema.table`, `schema.table.column`) and sample values before emitting them into wiki pages, SL sources, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback` records.
+
+## Non-goals
+
+- Not changing `wiki_write` itself. A complementary spec covers hard write-time validation; this spec focuses on giving the LLM the tools to self-validate.
+- Not modifying any Notion fetch/chunk/cluster behaviour.
+- Not changing the `_schema/*.yaml` format.
+- Not introducing a UUID layer for tables or columns; KTX keeps `(connection, catalog, db, name)` as the canonical table identity.
+- Not adding `semantic_query` to the synthesis toolset. `semantic_query` is a future tool for the research/chat-time agent; synthesis creates SL sources rather than queries them, so the wrong shape.
+- Not adding `dictionary_search`. `entity_details` already returns per-column `sampleValues` from the relationship-profile, and `sql_execution` covers the rarer "where does this literal live?" case more accurately than a sampled-JSON full-text scan.
+
+## What already exists in KTX
+
+The dialect/driver/connection architecture is fully ported from Kaelio. The new tools sit on top of three already-shipping primitives:
+
+| Primitive | Location |
+|---|---|
+| `KtxTableRef = { catalog: string\|null, db: string\|null, name: string }` | `packages/context/src/scan/types.ts:168` |
+| `SemanticLayerService.executeQuery(connectionId, sql)` | `packages/context/src/sl/semantic-layer.service.ts:1004`, used today by `sl_validate` |
+| `assertReadOnlySql` / `limitSqlForExecution` | `packages/context/src/connections/read-only-sql.ts` |
+| 7 connectors with parallel layout (postgres, mysql, sqlserver, snowflake, bigquery, clickhouse, sqlite), each exporting a dialect class | `packages/connector-*` |
+| Raw scan artefacts: `tables/<base64(catalog??'_')>.<base64(db)>.<base64(name)>.json` and `enrichment/relationship-profile.json` (with `nativeType`, `nullable`, `primaryKey`, `foreignKeys`, `rowCount`, `nullCount`, `distinctCount`, `sampleValues`, descriptions) | `raw-sources/<connectionId>/live-database/<latest-sync>/` |
+| `wiki_search`, `sl_discover`, `sl_read_source`, `sl_validate`, `emit_unmapped_fallback` | already wired into synthesis stages |
+
+The only meaningfully new code is `WarehouseCatalogService`, a small `getDialectForDriver` dispatch, the three tool files, and the wiring in `ingest-bundle.runner.ts`.
+
+## Architecture
+
+### Module layout
+
+```
+packages/context/src/ingest/tools/warehouse-verification/
+  discover-data.tool.ts
+  entity-details.tool.ts
+  sql-execution.tool.ts
+  warehouse-catalog.service.ts
+  index.ts                       # exports createWarehouseVerificationTools()
+packages/context/src/connections/
+  dialects.ts                    # adds getDialectForDriver()
+packages/context/skills/_shared/
+  identifier-verification.md     # the protocol snippet referenced from every synthesis skill
+```
+
+### Canonical table identity
+
+Every tool that names a warehouse object uses the tuple `(connectionName, catalog, db, name[, column])`. `connectionName` is the slug from `ktx.yaml` (e.g., `"warehouse"`), validated against `^[a-zA-Z0-9][a-zA-Z0-9_-]*$`. There is no UUID layer.
+
+`display` strings the LLM picks up from source pages (e.g., `"orbit_raw.accounts"` for Postgres or `"project.dataset.table"` for BigQuery) are parsed by `WarehouseCatalogService.resolveDisplay`, which knows the connection's driver via `getDialectForDriver`. Ambiguous parses (e.g., a 2-part display on BigQuery) return a candidates list instead of guessing.
+
+Dialect mapping:
+
+| Driver | catalog | db | name | Display |
+|---|---|---|---|---|
+| postgres | `null` | schema | table | `schema.table` |
+| mysql | `null` | schema | table | `schema.table` |
+| sqlserver | catalog | schema | table | `catalog.schema.table` |
+| snowflake | database | schema | table | `db.schema.table` |
+| bigquery | project | dataset | table | `project.dataset.table` |
+| clickhouse | `null` | database | table | `database.table` |
+| sqlite | `null` | `null` | table | `table` |
+
+### `WarehouseCatalogService`
+
+Stateless except for a per-WorkUnit cache. Reads raw scan files under `raw-sources/<connectionName>/live-database/<latest-sync>/`.
+
+```ts
+class WarehouseCatalogService {
+  getTable(ref: { connectionName: string } & KtxTableRef): Promise<TableDetail | null>;
+  listTables(connectionName: string): Promise<KtxTableRef[]>;
+  resolveDisplay(connectionName: string, display: string): Promise<{
+    resolved: KtxTableRef | null;
+    candidates: KtxTableRef[];   // ranked by edit distance when resolved is null
+    dialect: string;
+  }>;
+  searchByName(connectionName: string, query: string, limit: number): Promise<Array<
+    | { kind: 'table';  ref: KtxTableRef; matchedOn: 'name'|'db'|'comment'|'description' }
+    | { kind: 'column'; ref: KtxTableRef & { column: string }; matchedOn: 'name'|'comment'|'description' }
+  >>;
+  getLatestSyncId(connectionName: string): Promise<string | null>;
+}
+```
+
+`getTable` merges the raw schema file (native types, PK, FK, nullable) with the enrichment profile (row counts, null rates, distinct counts, sample values, AI-generated descriptions). When no scan exists for the connection, every read returns `null`; tools surface this as a distinct "no scan available" state rather than as "identifier not found", so the LLM doesn't conclude a real table is fictional just because a scan hasn't run yet.
+
+### `getDialectForDriver`
+
+```ts
+// packages/context/src/connections/dialects.ts
+export type SupportedDriver = 'postgres'|'postgresql'|'mysql'|'sqlserver'|'snowflake'|'bigquery'|'clickhouse'|'sqlite'|'sqlite3';
+export function getDialectForDriver(driver: SupportedDriver): KtxDialect;
+```
+
+Sync dispatch. The connectors' existing dialect classes already expose the same shape — `formatTableName(KtxTableRef)`, `quoteIdentifier(string)`, `mapToDimensionType(nativeType)`. The implementation plan introduces a minimal `KtxDialect` interface that these classes already satisfy structurally; no connector-internal changes required. Used by tools only for display-string parsing and error-message formatting; tools never construct executable SQL.
+
+## Tool contracts
+
+### `entity_details`
+
+```ts
+input = {
+  connectionName: string,
+  targets: Array<                          // 1..50, mixed shapes allowed
+    | { display: string }                  // "orbit_raw.accounts" or "orbit_raw.accounts.account_id"
+    | { catalog: string|null, db: string, name: string, column?: string }
+  >,
+}
+```
+
+Output (markdown, per target):
+
+```
+### orbit_raw.accounts
+Type: table | Native columns: 11 | PK: account_id | FKs: parent_account_id → orbit_raw.accounts.account_id
+Description: One row per customer account…
+
+Columns:
+- account_id (text, nullable=false, PK) — sample: ["acct_001","acct_002",…]
+- parent_account_id (text, nullable=true, FK → orbit_raw.accounts.account_id)
+- account_name (text, nullable=false)
+- …
+
+Profile: rowCount=4321 distinctCount(account_id)=4321 nullRate(parent_account_id)=0.62
+```
+
+When `column` is provided in a target, output is scoped to that one column. When a target doesn't resolve, output is `Not found in scan. Closest matches: …` with up to 5 candidates from `searchByName`. When the connection has no `live-database` scan, output is `No live-database scan available for connection "<name>"; run \`ktx scan\` first.` — distinct from the "not found" state.
+
+Structured output: `{ resolved: TableDetail[], missing: Array<{target, candidates}>, scanAvailable: boolean }`.
+
+Refuses `connectionName` values not in the WU-stage's `allowedConnectionNames` set.
+
+### `sql_execution`
+
+```ts
+input = {
+  connectionName: string,
+  sql: string,                             // single SELECT or WITH only
+  rowLimit?: number,                       // default 100, hard cap 1000
+}
+```
+
+Pipeline:
+
+1. `assertReadOnlySql(sql)` — regex rejects anything starting with `insert|update|delete|merge|alter|drop|create|truncate|grant|revoke|copy|call|do|vacuum|analyze|refresh`.
+2. `limitSqlForExecution(sql, rowLimit)` — wraps as `select * from (<llm_sql>) as ktx_query_result limit N`.
+3. `SemanticLayerService.executeQuery(connectionName, wrappedSql)`.
+4. Format as markdown table; first ~20 rows inline; if truncated, append `… +N more rows`.
+
+Structured output: `{ headers, rows, rowCount, truncated, sql, wrappedSql }`.
+
+Connector errors surface verbatim (e.g., Postgres `relation "orbit_analytics.customer" does not exist`). That error message is the most valuable verification signal — it tells the LLM the identifier is fictional.
+
+Refuses `connectionName` not in `allowedConnectionNames`. Each connector's driver-level read-only enforcement (Postgres read-only transaction, BigQuery query-only jobs) is a second defence under the regex gate.
+
+### `discover_data`
+
+```ts
+input = {
+  query: string,
+  connectionName?: string,                 // omit to search all configured warehouse connections
+  limit?: number,                          // default 10 per section
+  sourceName?: string,                     // SL source detail mode (delegates to sl_discover)
+}
+```
+
+Composes three searches and groups output into three sections, omitting empty sections:
+
+1. **Wiki Pages** — `wiki_search({query, limit})`. Routing hint: *use `wiki_read(blockKey)` for full content*.
+2. **Semantic Layer Sources** — `sl_discover({query, connectionName})`. Routing hint: *use `sl_read_source(sourceName)` for the YAML, or `entity_details` for warehouse-shape details*.
+3. **Raw Warehouse Schema** — `WarehouseCatalogService.searchByName(connectionName, query, limit)`. Routing hint: *use `entity_details({connectionName, targets: [{display}]})` for full DDL + sample values*.
+
+When `sourceName` is set, delegates entirely to `sl_discover` inspect mode and skips other sections. When all three sections are empty, output is `No matches for "<query>" across wiki, semantic layer, or raw warehouse schema. Try broader terms; this concept may not exist yet.`
+
+Structured output: `{ wiki: WikiSearchStructured|null, sl: SlDiscoverStructured|null, raw: RawSchemaHits|null }`.
+
+## Wiring
+
+`packages/context/src/ingest/ingest-bundle.runner.ts` already plumbs `emit_unmapped_fallback` into both the WorkUnit stage (`createEmitUnmappedFallbackTool` around line 726) and the reconcile stage (around line 962), with merging done via `packages/context/src/ingest/stages/build-wu-context.ts` and `build-reconcile-context.ts`.
+
+Add a parallel factory next to those existing calls:
+
+```ts
+const warehouseTools = createWarehouseVerificationTools({
+  semanticLayerService: scopedSemanticLayerService,
+  warehouseCatalog: new WarehouseCatalogService({ fileStore, projectDir }),
+  dialects: getDialectForDriver,
+  allowedConnectionNames: slConnectionIds,   // reuse existing scoping
+  sqlExecutionRowLimit: 100,
+});
+// Merge `entity_details`, `sql_execution`, `discover_data` into both stage tool maps
+// alongside emit_unmapped_fallback.
+```
+
+`createWarehouseVerificationTools` returns `Record<string, Tool>` with three keys. The set is wired into every adapter's synthesis stage — no per-adapter opt-in.
+
+## Skill-prompt updates
+
+### Shared protocol
+
+`packages/context/skills/_shared/identifier-verification.md`:
+
+```md
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+1. `discover_data({query: "<topic>"})` — see what wikis, SL sources, and raw tables
+   already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` —
+   confirm the identifier resolves; inspect native types, FK/PK, and sampleValues.
+3. For literal values from the source (status codes, plan tiers): check whether
+   they appear in `entity_details`' `sampleValues` for the relevant column.
+   If `sampleValues` is short or you suspect the sample missed real values, run
+   a `sql_execution` probe: `SELECT DISTINCT <col> FROM <ref> LIMIT 50`.
+4. If the candidate identifier still doesn't resolve, do one of:
+   (a) Use `sql_execution` with `SELECT 1 FROM <ref> LIMIT 0`. If it errors,
+       the identifier is fictional.
+   (b) Wrap the identifier in `[unverified — from <rawPath>]` in the wiki body,
+       citing the exact raw path that mentioned it.
+   (c) When recording `emit_unmapped_fallback` with `no_physical_table`,
+       include the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+```
+
+Each affected skill inlines this block verbatim (skill files are independent prompts; KTX has no cross-skill include mechanism today).
+
+### Per-skill diffs
+
+Two skills are deliberately excluded from updates: `ingest_triage` (read-only triage; produces no wiki or SL output) and `sl` (umbrella reference doc; cross-links to the protocol but doesn't need its own copy).
+
+| Skill | Changes |
+|---|---|
+| `notion_synthesize` | Inline protocol; append `discover_data`, `entity_details`, `sql_execution` to `Allowed:` (line 74); replace `orbit_analytics.customer` example on line 70 with `<schema>.<table>` |
+| `dbt_ingest` | Inline protocol; line 24: replace `wiki_sl_search` → `discover_data` and `sl_describe_table` → `entity_details`; strengthen the "not permission to invent physical columns" paragraph by naming `entity_details` as the verification call |
+| `lookml_ingest` | Inline protocol; add: "Verify each `sql_table_name` from the LookML view with `entity_details` before mapping to an SL source" |
+| `looker_ingest` | Inline protocol; add: "For every Looker field reference, call `entity_details` on the underlying `(schema, table, column)` before promoting to `sl_refs` or quoting in wiki body" |
+| `metabase_ingest` | Inline protocol; add: "Before writing a wiki page derived from a Metabase question's SQL, verify each `schema.table.column` mentioned with `entity_details`" |
+| `metricflow_ingest` | Inline protocol; add: "Verify each MetricFlow model's source table with `entity_details` before producing the corresponding `sl_write_source`" |
+| `live_database_ingest` | Inline protocol; add: "Sample values come from the scan record; do not invent values not present in `relationship-profile.json`" |
+| `historic_sql_table_digest` | Shortened protocol focused on column attribution: "Only mention columns visible in the table's scan record. Use `entity_details({display})` if uncertain" |
+| `historic_sql_patterns` | Inline protocol; add: "Every join column mentioned in pattern descriptions must be verified via `entity_details` for both sides of the join" |
+| `knowledge_capture` | Inline protocol; update line 44: "First call `discover_data` to find existing wiki pages, SL sources, and raw tables on the topic" |
+| `sl_capture` | Inline protocol; add: "Before `sl_write_source`, call `entity_details` on the target table to confirm column names and types match the YAML being written" |
+
+### Cleanups beyond the four-tool addition
+
+- `notion_synthesize/SKILL.md:70` — remove `orbit_analytics.customer` (placeholder).
+- `packages/context/src/ingest/tools/emit-unmapped-fallback.tool.ts:67` — same example string in the Zod `.describe()` — replace with `<schema>.<table>`.
+- `dbt_ingest/SKILL.md:24` — fix `wiki_sl_search` and `sl_describe_table` (neither tool exists in KTX).
+- `packages/context/src/sl/tools/sl-warehouse-validation.ts:93` — inline error message references the non-existent `sl_describe_table`. Replace with `sl_read_source`.
+
+## Testing strategy
+
+### Unit tests
+
+| Component | Tests |
+|---|---|
+| `getDialectForDriver` | Every supported driver returns a dialect; unknown driver throws with a clear list of supported drivers |
+| `WarehouseCatalogService.getTable` | Reads and merges `tables/<b64>.json` and `relationship-profile.json`; returns `null` when no sync exists; returns `null` for unknown `(catalog, db, name)` |
+| `WarehouseCatalogService.resolveDisplay` | Postgres 2-part display → `{catalog: null, db, name}`; BigQuery 3-part display → `{catalog, db, name}`; ambiguous 2-part on BigQuery returns candidates list; unknown displays produce closest-match candidates ordered by edit distance |
+| `WarehouseCatalogService.searchByName` | Substring and token match; tiers (exact-name → token-match) ordered correctly; cache hit on second call within same instance |
+| `entity_details` | Resolves `{display}` and structured inputs; reports "Not found" with candidates for unknown ref; reports "no scan available" distinctly when scan dir missing; truncates above 50 targets |
+| `discover_data` | Three sections present when all three have hits; sections omitted when empty; `sourceName` inspect mode delegates to `sl_discover` and skips other sections; `allowedConnectionNames` scope honoured |
+| `sql_execution` | `assertReadOnlySql` rejects each mutating verb; row-limit wrap visible in `wrappedSql`; connector errors surface verbatim with the failing SQL; rejects `connectionName` not in `allowedConnectionNames` |
+
+### Integration tests
+
+- Extend `packages/context/src/ingest/ingest-bundle.runner.test.ts` to verify the three new tools are present in both WU-stage and reconcile-stage tool maps and refuse out-of-scope `connectionName` values.
+- New fixture-based test: stage a small `raw-sources/<conn>/live-database/<sync>/` directory with 2 tables + 1 enrichment profile, then call each tool through the runner's tool map and assert the markdown contains the expected fields. Uses the same fake-LLM harness as `notion.adapter.test.ts`.
+- One end-to-end regression test reproducing the `orbit_analytics.customer` hallucination: a fake Notion page mentioning the fictional table is fed to the synthesis stage; the run produces a wiki page where the fictional name is wrapped in `[unverified — …]` or omitted, not promoted to `tables:` frontmatter.
+
+### Prompt-bundling tests
+
+Extend `packages/context/src/memory/memory-runtime-assets.test.ts`:
+
+- Every skill in the synthesis-writers list embeds the verification-protocol block (assert by stable header text).
+- Every such skill lists the three new tools when it has a `## Tools / Allowed` section, or mentions them inline in a workflow step otherwise.
+- No skill file contains any of the banned strings: `orbit_analytics.customer`, `wiki_sl_search`, `sl_describe_table`.
+
+### Performance guards
+
+`WarehouseCatalogService` caches the per-connection table list per stage (one WorkUnit's lifetime). Tests assert second call is a cache hit. No DB index for `searchByName` in this iteration — linear scan over scan artefacts is acceptable up to ~50K columns. If volume warrants it later, a follow-up PR adds a SQLite FTS index.
+
+## Rollout
+
+Four mergeable PRs:
+
+| PR | Lands |
+|---|---|
+| 1 | `getDialectForDriver` + `WarehouseCatalogService` + `entity_details` tool + wiring in `ingest-bundle.runner.ts` + unit/integration tests |
+| 2 | `sql_execution` tool + tests + the `orbit_analytics.customer` regression test (which exercises protocol steps 4a/4c) |
+| 3 | `discover_data` tool + tests |
+| 4 | All 11 skill prompts updated with the verification protocol + the three cleanups + extended `memory-runtime-assets.test.ts` |
+
+Skill prompts land last so they can reference the tools that already exist.
+
+## Out of scope
+
+- **Hard write-time validation in `wiki_write` / `emit_unmapped_fallback`.** A complementary spec covers regex-based identifier validation at the write boundary. Defence-in-depth — separate concern.
+- **SQLite FTS index for `searchByName`.** Deferred until the linear scan benchmark fails.
+- **`raw_schema_search` as a standalone tool.** `discover_data`'s raw section covers the concept-search case.
+- **`semantic_query` in the synthesis toolset.** `semantic_query` will exist in KTX for the research/chat-time agent; it is deliberately excluded from synthesis because synthesis creates SL sources rather than queries them.
+- **`dictionary_search`.** `entity_details` already returns per-column `sampleValues`; for the rarer "where does this literal live?" case, `sql_execution` is more accurate than a sampled-JSON scan.
+- **UUID layer for tables/columns.** KTX deliberately stays string-keyed on `(connection, catalog, db, name)`.

packages/cli/src/ingest-query-executor.test.ts

@@ -0,0 +1,86 @@
+import type { KtxLocalProject } from '@ktx/context/project';
+import { createKtxConnectorCapabilities, type KtxScanConnector } from '@ktx/context/scan';
+import { describe, expect, it, vi } from 'vitest';
+import { createKtxCliIngestQueryExecutor } from './ingest-query-executor.js';
+
+function project(): KtxLocalProject {
+  return {
+    projectDir: '/tmp/ktx-query-project',
+    config: {
+      project: 'warehouse',
+      connections: {
+        warehouse: { driver: 'postgres', url: 'postgresql://readonly@example.test/db' },
+      },
+    },
+  } as unknown as KtxLocalProject;
+}
+
+function connector(overrides: Partial<KtxScanConnector> = {}): KtxScanConnector {
+  return {
+    id: 'warehouse',
+    driver: 'postgres',
+    capabilities: createKtxConnectorCapabilities({ readOnlySql: true }),
+    async introspect() {
+      throw new Error('introspect is not used by this test');
+    },
+    executeReadOnly: vi.fn(async () => ({
+      headers: ['answer'],
+      rows: [[1]],
+      totalRows: 1,
+      rowCount: 1,
+    })),
+    cleanup: vi.fn(async () => {}),
+    ...overrides,
+  };
+}
+
+describe('createKtxCliIngestQueryExecutor', () => {
+  it('executes read-only SQL through the scan connector and cleans it up', async () => {
+    const scanConnector = connector();
+    const createConnector = vi.fn(async () => scanConnector);
+    const executor = createKtxCliIngestQueryExecutor(project(), { createConnector });
+
+    await expect(
+      executor.execute({
+        connectionId: 'warehouse',
+        connection: { driver: 'postgres', url: 'postgresql://readonly@example.test/db' },
+        projectDir: '/tmp/ktx-query-project',
+        sql: 'select 1',
+        maxRows: 5,
+      }),
+    ).resolves.toMatchObject({
+      headers: ['answer'],
+      rows: [[1]],
+      totalRows: 1,
+      command: 'SELECT',
+      rowCount: 1,
+    });
+
+    expect(createConnector).toHaveBeenCalledWith(project(), 'warehouse');
+    expect(scanConnector.executeReadOnly).toHaveBeenCalledWith(
+      { connectionId: 'warehouse', sql: 'select 1', maxRows: 5 },
+      { runId: 'ingest-sql-execution' },
+    );
+    expect(scanConnector.cleanup).toHaveBeenCalledTimes(1);
+  });
+
+  it('rejects connectors without read-only SQL support', async () => {
+    const scanConnector = connector({
+      capabilities: createKtxConnectorCapabilities({ readOnlySql: false }),
+      executeReadOnly: undefined,
+    });
+    const executor = createKtxCliIngestQueryExecutor(project(), {
+      createConnector: vi.fn(async () => scanConnector),
+    });
+
+    await expect(
+      executor.execute({
+        connectionId: 'warehouse',
+        connection: { driver: 'postgres' },
+        projectDir: '/tmp/ktx-query-project',
+        sql: 'select 1',
+      }),
+    ).rejects.toThrow('Connection "warehouse" driver "postgres" does not support read-only SQL execution.');
+    expect(scanConnector.cleanup).toHaveBeenCalledTimes(1);
+  });
+});

packages/cli/src/ingest-query-executor.ts

@@ -0,0 +1,49 @@
+import type { KtxSqlQueryExecutionInput, KtxSqlQueryExecutorPort } from '@ktx/context/connections';
+import type { KtxLocalProject } from '@ktx/context/project';
+import type { KtxScanConnector, KtxScanContext } from '@ktx/context/scan';
+import { createKtxCliScanConnector } from './local-scan-connectors.js';
+
+type CreateConnector = typeof createKtxCliScanConnector;
+
+export interface KtxCliIngestQueryExecutorDeps {
+  createConnector?: CreateConnector;
+}
+
+async function cleanupConnector(connector: KtxScanConnector | null): Promise<void> {
+  await connector?.cleanup?.();
+}
+
+export function createKtxCliIngestQueryExecutor(
+  project: KtxLocalProject,
+  deps: KtxCliIngestQueryExecutorDeps = {},
+): KtxSqlQueryExecutorPort {
+  const createConnector = deps.createConnector ?? createKtxCliScanConnector;
+  return {
+    async execute(input: KtxSqlQueryExecutionInput) {
+      let connector: KtxScanConnector | null = null;
+      try {
+        connector = await createConnector(project, input.connectionId);
+        if (!connector.capabilities.readOnlySql || !connector.executeReadOnly) {
+          throw new Error(
+            `Connection "${input.connectionId}" driver "${connector.driver}" does not support read-only SQL execution.`,
+          );
+        }
+
+        const ctx: KtxScanContext = { runId: 'ingest-sql-execution' };
+        const result = await connector.executeReadOnly(
+          { connectionId: input.connectionId, sql: input.sql, maxRows: input.maxRows },
+          ctx,
+        );
+        return {
+          headers: result.headers,
+          rows: result.rows,
+          totalRows: result.totalRows,
+          command: 'SELECT',
+          rowCount: result.rowCount,
+        };
+      } finally {
+        await cleanupConnector(connector);
+      }
+    },
+  };
+}

packages/cli/src/ingest.test-utils.ts

@@ -261,6 +261,18 @@ export class CliLookerSlWritingAgentRunner extends AgentRunnerService {
       params.telemetryTags?.operationName === 'ingest-bundle-wu' &&
       params.telemetryTags?.unitKey === 'looker-explore-ecommerce-orders'
     ) {
+      const ledger = params.toolSet.record_verification_ledger;
+      if (!ledger?.execute) {
+        throw new Error('record_verification_ledger tool was not available to the Looker WorkUnit');
+      }
+      await ledger.execute(
+        {
+          summary: 'Test fixture verified Looker explore target identifiers before writing SL.',
+          verifiedIdentifiers: ['prod-warehouse', 'public.orders'],
+          unverifiedIdentifiers: [],
+        },
+        { toolCallId: 'cli-looker-verification-ledger', messages: [] },
+      );
       const slWrite = params.toolSet.sl_write_source;
       if (!slWrite?.execute) {
         throw new Error('sl_write_source tool was not available to the Looker WorkUnit');

packages/cli/src/ingest.test.ts

@@ -810,6 +810,44 @@ describe('runKtxIngest', () => {
     expect(runLocalIngest).toHaveBeenCalledWith(expect.objectContaining({ llmDebugRequestFile: debugFile }));
   });
 
+  it('supplies a scan-connector query executor to local ingest runs', async () => {
+    const io = makeIo();
+    const projectDir = join(tempDir, 'query-executor-project');
+    await writeWarehouseConfig(projectDir);
+    const queryExecutor = {
+      execute: vi.fn(async () => ({
+        headers: [],
+        rows: [],
+        totalRows: 0,
+        command: 'SELECT',
+        rowCount: 0,
+      })),
+    };
+    const runLocalIngest = vi.fn(async (input: RunLocalIngestOptions): Promise<LocalIngestResult> =>
+      completedLocalBundleRun(input, 'query-executor-run'),
+    );
+
+    await expect(
+      runKtxIngest(
+        {
+          command: 'run',
+          projectDir,
+          connectionId: 'warehouse',
+          adapter: 'fake',
+          outputMode: 'json',
+        },
+        io.io,
+        {
+          runLocalIngest,
+          createAdapters: () => [],
+          createQueryExecutor: () => queryExecutor,
+        },
+      ),
+    ).resolves.toBe(0);
+
+    expect(runLocalIngest).toHaveBeenCalledWith(expect.objectContaining({ queryExecutor }));
+  });
+
   it('passes daemon database introspection URL to default local ingest adapters', async () => {
     const projectDir = join(tempDir, 'project');
     await writeWarehouseConfig(projectDir);

packages/cli/src/ingest.ts

@@ -16,7 +16,9 @@ import {
   runLocalMetabaseIngest,
   savedMemoryCountsForReport,
 } from '@ktx/context/ingest';
-import { loadKtxProject } from '@ktx/context/project';
+import type { KtxSqlQueryExecutorPort } from '@ktx/context/connections';
+import { loadKtxProject, type KtxLocalProject } from '@ktx/context/project';
+import { createKtxCliIngestQueryExecutor } from './ingest-query-executor.js';
 import { readIngestReportSnapshotFile } from './ingest-report-file.js';
 import { createCliOperationalLogger } from './io/logger.js';
 import { createKtxCliLocalIngestAdapters } from './local-adapters.js';
@@ -69,6 +71,7 @@ interface KtxIngestDeps {
   jobIdFactory?: () => string;
   now?: () => Date;
   createAdapters?: typeof createKtxCliLocalIngestAdapters;
+  createQueryExecutor?: (project: KtxLocalProject) => KtxSqlQueryExecutorPort;
   runLocalIngest?: typeof runLocalIngest;
   runLocalMetabaseIngest?: typeof runLocalMetabaseIngest;
   readReportFile?: typeof readIngestReportSnapshotFile;
@@ -532,6 +535,9 @@ export async function runKtxIngest(
         ...(args.adapter === 'historic-sql' ? { historicSqlConnectionId: args.connectionId } : {}),
         logger: operationalLogger,
       };
+      const queryExecutor =
+        localIngestOptions.queryExecutor ??
+        (deps.createQueryExecutor ?? createKtxCliIngestQueryExecutor)(project);
       if (args.adapter === 'metabase' && args.sourceDir) {
         throw new Error('source-dir uploads are not supported for the Metabase fan-out adapter');
       }
@@ -544,6 +550,7 @@ export async function runKtxIngest(
           adapters: createAdapters(project, adapterOptions),
           metabaseConnectionId: args.connectionId,
           ...localIngestOptions,
+          queryExecutor,
           trigger: 'manual_resync',
           jobIdFactory: deps.jobIdFactory,
           ...(progress ? { progress } : {}),
@@ -604,6 +611,7 @@ export async function runKtxIngest(
           trigger: 'manual_resync',
           jobId,
           ...localIngestOptions,
+          queryExecutor,
           pullConfigOptions: adapterOptions,
           ...(args.debugLlmRequestFile ? { llmDebugRequestFile: args.debugLlmRequestFile } : {}),
           ...(memoryFlow ? { memoryFlow } : {}),

packages/context/prompts/memory_agent_bundle_ingest_reconcile.md

@@ -20,6 +20,7 @@ Parsimonious. Stage 3 WUs already loaded `ingest_triage` and handled conflicts t
 
 <scope>
 All wiki writes are GLOBAL (same as Stage 3). SL writes target the same session worktree Stage 3 used.
+Wiki keys must be flat slugs, not directory paths. If a Stage 3 page used a path-like key and a flat retry exists, treat the flat key as the canonical page.
 </scope>
 
 <do_not>

packages/context/prompts/memory_agent_bundle_ingest_work_unit.md

@@ -1,5 +1,5 @@
 <role>
-You are processing ONE WorkUnit of a multi-file ingest bundle. The WorkUnit gives you a slice of raw source files (LookML views, dbt/MetricFlow YAMLs, Metabase card JSONs, or similar) and you must translate that slice into KTX semantic-layer sources and/or knowledge wiki pages, in one pass. Prior WorkUnits in this same job may have already written SL sources and wiki pages; their writes are visible on the working branch and searchable via `wiki_sl_search`.
+You are processing ONE WorkUnit of a multi-file ingest bundle. The WorkUnit gives you a slice of raw source files (LookML views, dbt/MetricFlow YAMLs, Metabase card JSONs, Notion pages, or similar) and you must translate that slice into KTX semantic-layer sources and/or knowledge wiki pages, in one pass. Prior WorkUnits in this same job may have already written SL sources and wiki pages; their writes are visible on the working branch and discoverable with `discover_data`.
 </role>
 
 <stance>
@@ -8,9 +8,9 @@ Assertive. The bundle was explicitly submitted for ingest. Default to capturing
 
 <workflow>
 1. Read this WorkUnit's section at the end of the user prompt. It lists your `rawFiles`, any unchanged `dependencyPaths` you may need to resolve references, the `peerFileIndex` (paths only; you CANNOT read them), the source's `skillNames`, and any `priorProvenance` rows telling you what earlier syncs produced from these files.
-2. Load the per-source review skill first (e.g. `lookml_ingest`, `metricflow_ingest`, `dbt_ingest`), then `sl_capture` and `knowledge_capture`, and `ingest_triage` last. The triage skill tells you how to react when `wiki_sl_search` reveals that a prior WU already wrote something overlapping.
+2. Load the per-source review skill first (e.g. `lookml_ingest`, `metricflow_ingest`, `dbt_ingest`), then `sl_capture` and `knowledge_capture`, and `ingest_triage` last. The triage skill tells you how to react when `discover_data` reveals that a prior WU already wrote something overlapping.
 3. If the system prompt includes `<canonical_pins>`, read those pins before choosing artifact keys. A pin's `canonicalArtifactKey` is the preferred artifact for its `contestedKey`: prefer editing the pinned canonical artifact when it already exists or when this raw file clearly updates it. Do not create a duplicate contested artifact when a pin says another artifact is canonical; use a specific disambiguated key only when the raw file describes a genuinely different domain.
-4. For each raw file: call `read_raw_file` (or `read_raw_span` for slicing large files) to load content. Before writing a new SL source or wiki page, call `wiki_sl_search` for each candidate name to find prior-WU writes; apply `ingest_triage` when you hit one, and apply any matching canonical pin before deciding whether to edit, rename, or skip.
+4. For each raw file: call `read_raw_file` (or `read_raw_span` for slicing large files) to load content. Before writing a new SL source or wiki page, call `discover_data` for each candidate source, table, metric, or topic name to find prior-WU writes, existing wiki pages, SL sources, and raw warehouse matches; apply `ingest_triage` when you hit one, and apply any matching canonical pin before deciding whether to edit, rename, or skip.
 5. For every `wiki_write`, `wiki_remove`, `sl_write_source`, or `sl_edit_source` call, include `rawPaths` with only the raw file paths that directly support that action. If one artifact synthesizes several files, list each contributing raw file. Do not include unrelated files from the same WorkUnit.
 6. When `priorProvenance` names an existing artifact for one of your raw files, prefer `sl_edit` over `sl_write` for that artifact: the re-ingest change rule says expression-only changes replace silently, grain/column/filter changes replace and flag.
 7. When a raw file cannot map to normal SL and you use a fallback path, call `emit_unmapped_fallback` exactly once for that raw file and reason. Use `fallback: "sql_standalone"` for a standalone SQL source, `fallback: "wiki_only"` for documentation-only capture, and `fallback: "flagged"` when no reliable artifact can be written.
@@ -19,12 +19,13 @@ Assertive. The bundle was explicitly submitted for ingest. Default to capturing
 
 <scope>
 All wiki writes go to the GLOBAL scope. Bundle ingests are not personal. The `wiki_write` tool selects scope automatically for this caller.
+Wiki keys must be flat slugs like `paid-order-lifecycle`, not directory paths like `historic-sql/paid-order-lifecycle`. Use `tags`, `source`, and page content to group related pages.
 </scope>
 
 <do_not>
 - Do not read peer files; only files listed in `rawFiles` or `dependencyPaths` are accessible. `read_raw_file` will reject everything else.
 - Do not invent measures/joins/rules not declared in the raw files.
-- Do not invent physical column names or grain keys. For table-backed SL sources, every `columns:`, `grain:`, `joins:`, `segments:`, and `measures[].expr` column must come from raw-file column declarations or warehouse-backed discovery (`wiki_sl_search`, `sl_discover`, `sl_describe_table`). If column names are not confirmed, capture the business context in wiki instead of writing a full SL source.
+- Do not invent physical column names or grain keys. For table-backed SL sources, every `columns:`, `grain:`, `joins:`, `segments:`, and `measures[].expr` column must come from raw-file column declarations or warehouse-backed discovery (`discover_data`, `sl_discover`, `entity_details`). If column names are not confirmed, capture the business context in wiki instead of writing a full SL source.
 - Do not write context-source overlays into the context source connection just because that is the current WorkUnit connection. Use `sl_discover` across data sources and write the SL artifact to the warehouse/data-source connection that owns the matching manifest. If there is no confirmed target connection, use `emit_unmapped_fallback` and wiki capture.
 - Do not duplicate an artifact that prior provenance says you already produced; update it.
 - Do not silently accept a name collision with a prior WU's write when the formula differs. Trigger `ingest_triage`.

packages/context/skills/_shared/identifier-verification.md

@@ -0,0 +1,27 @@
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.

packages/context/skills/dbt_ingest/SKILL.md

@@ -12,16 +12,16 @@ Use this skill for **uploaded** dbt projects (`dbt_project.yml` at stage root, `
 
 | dbt | KTX | Notes |
 |-----|--------|--------|
-| `models:` entry with `columns:` | **Overlay** on the manifest table with the same name (after `wiki_sl_search` / `sl_describe_table`) | One SL source per physical table; model name may differ from DB name — resolve with `read_raw_file` + warehouse context. |
+| `models:` entry with `columns:` | **Overlay** on the manifest table with the same name (after `discover_data` / `entity_details`) | One SL source per physical table; model name may differ from DB name — resolve with `read_raw_file` + warehouse context. |
 | `sources:` → `tables:` | Same as models; use `identifier` when present instead of logical `name`. | Schema + name must match how the connection sees tables. |
 | Column `description` | `descriptions.user` or merged `descriptions` map on the column | Do not overwrite `dbt` description keys from sync. |
 | `data_tests: not_null` / `unique` | Short hint in column `descriptions` or notes: “dbt: not null”, “dbt: unique” | Full structured metadata lands in manifest via **sync**; the skill keeps bundle-time SL text useful for the agent. |
-| `accepted_values` | Add a **brief** line in the column description: allowed values (truncate long lists) | Also mention enum-like use in `wiki_sl_search` / filters. |
-| `relationships` | Add or confirm `joins:` on the overlay **only** when `to` resolves to a real table via `read_raw_file` + `wiki_sl_search` / `sl_describe_table` | If the ref cannot be resolved, capture the intent in a wiki page instead. |
+| `accepted_values` | Add a **brief** line in the column description: allowed values (truncate long lists) | Also mention enum-like use in `discover_data` / filters. |
+| `relationships` | Add or confirm `joins:` on the overlay **only** when `to` resolves to a real table via `read_raw_file` + `discover_data` / `entity_details` | If the ref cannot be resolved, capture the intent in a wiki page instead. |
 
 ## Physical schema grounding
 
-dbt YAML is documentation and test metadata; it is not permission to invent physical columns. Before writing any table-backed SL source, confirm the real warehouse shape with `wiki_sl_search`, `sl_discover`, or `sl_describe_table` and use only confirmed column names in `columns:`, `grain:`, `joins:`, `segments:`, and `measures[].expr`.
+dbt YAML is documentation and test metadata; it is not permission to invent physical columns. Before writing any table-backed SL source, confirm the real warehouse shape with `discover_data`, `sl_discover`, or `entity_details` and use only confirmed column names in `columns:`, `grain:`, `joins:`, `segments:`, and `measures[].expr`.
 
 For dbt context-source ingest, the dbt connection is usually not the warehouse connection. Call `sl_discover` without `connectionId` first, then write overlays to the connection that owns the matching manifest-backed source (for example `postgres-warehouse`), not to the dbt connection (for example `dbt-main`). If no matching manifest-backed source is visible on any warehouse connection, do not call `sl_write_source`; record `emit_unmapped_fallback` and keep the fact wiki-only.
 
@@ -31,6 +31,34 @@ Include `rawPaths` on every `wiki_write`, `sl_write_source`, and `sl_edit_source
 
 After every `sl_write_source`, call `sl_validate`. A validation error saying a declared column or measure reference is absent from the physical table is a hard stop: re-read the warehouse-backed source and rewrite with confirmed names, or remove the invalid SL fields.
 
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+
 ## 1.1 test hints (descriptions / meta)
 
 When YAML shows `accepted_values` or `not_null`, add **short** hints into `columns[].descriptions` (e.g. under `user`) or freeform column notes so chat and validation see intent before the next git sync refreshes `constraints` / `enum_values` in `_schema`. Keep hints under a few words when possible.

packages/context/skills/historic_sql_patterns/SKILL.md

@@ -18,6 +18,37 @@ Use this skill when the WorkUnit raw file is a `patterns-input/part-0001.json` s
 6. Set each evidence object's `rawPath` to the exact raw file path read in step 3.
 7. Stop after all pattern evidence has been emitted.
 
+Every join column mentioned in pattern descriptions must be verified via
+entity_details for both sides of the join.
+
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+
 ## Evidence Shape
 
 Each call to `emit_historic_sql_evidence` must use this shape:

packages/context/skills/historic_sql_table_digest/SKILL.md

@@ -17,6 +17,34 @@ Use this skill when the WorkUnit raw file is one `tables/<schema>.<name>.json` f
 5. Call `emit_historic_sql_evidence` exactly once with `kind: "table_usage"`.
 6. Stop after the evidence tool succeeds.
 
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+
 ## Evidence Shape
 
 Call `emit_historic_sql_evidence` with this shape:

packages/context/skills/knowledge_capture/SKILL.md

@@ -40,6 +40,8 @@ If nothing is worth capturing, respond without calling any tool.
 
 1. Read the wiki index (provided in the prompt) and decide whether the turn introduces durable knowledge.
 2. **Before writing**, search for related content so cross-references are accurate:
+   - `discover_data` first when a page relates to data or SL concepts — find
+     existing wiki pages, SL sources, and raw warehouse schema together.
    - `wiki_search` with the topic — find related wiki pages to populate `refs`.
    - `sl_discover` with the concept — if the page defines a metric (revenue, churn, retention, LTV, ARR, MRR, CAC, attribution, etc.), find matching SL sources or measures to populate `sl_refs`. If no matches, pass `sl_refs: []` so future readers know you checked.
 3. If updating an existing page, `wiki_read` it first. Use the returned `structured.content` or markdown body as the exact stored text for targeted replacements; current tags, refs, and sl_refs are returned in structured metadata.
@@ -48,6 +50,34 @@ If nothing is worth capturing, respond without calling any tool.
 
 For bundle/external ingest, include `rawPaths` on every `wiki_write`/`wiki_remove` call with only the raw files that directly support that wiki action. This keeps ingest provenance tied to the actual source file, not every file in the WorkUnit.
 
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+
 ## Keys, summaries, and content
 
 - **Keys** are short kebab-case topic identifiers: `leads-source-filter`, `revenue-definition`, `churn-calculation`. No namespacing, no prefixes.
@@ -70,6 +100,10 @@ The `wiki_write` tool accepts three array fields that go into the page frontmatt
 - **`refs`**: keys of related wiki pages. Add when the new page materially depends on concepts from another (e.g., a churn definition that uses the paid-orders filter from a revenue definition). Don't add refs just because pages share a topic area.
 - **`sl_refs`**: names of SL sources or measures the page relates to. Format: `"source_name"` or `"source_name.measure_name"`. Discover via `sl_discover` → inspect with `sl_read_source` → include the confirmed matches.
 
+Wiki page keys must be flat slugs. Use `large-contract-requesters`, not
+`historic-sql/large-contract-requesters`. Use `tags`, `source`, and content
+headings for grouping.
+
 ### Replace semantics
 
 All three fields use REPLACE semantics on update:

packages/context/skills/live_database_ingest/SKILL.md

@@ -24,6 +24,37 @@ Use this skill when the ingest work unit contains raw files under
    or column comments.
 9. Run `sl_validate` for the table source before the work unit completes.
 
+Sample values come from the scan record; do not invent values not present in
+relationship-profile.json.
+
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+
 ## Source shape
 
 For a raw table with this shape:

packages/context/skills/looker_ingest/SKILL.md

@@ -21,6 +21,37 @@ Looker runtime ingest turns API-staged dashboards, Looks, and explores into dura
 9. Write SL from Looker runtime evidence only through the staged warehouse target contract. For explores and inherited dashboard/Look queries, branch on `targetTable.ok`; when it is true, write on `targetWarehouseConnectionId` and use `targetTable.canonicalTable` as `source.table`. When it is false or missing, write wiki knowledge candidates and record `emit_unmapped_fallback` with the staged reason.
 10. Run `sl_validate` after every SL write. If validation fails, fix the source or roll it back before the WorkUnit ends.
 
+For every Looker field reference, call entity_details on the underlying
+schema.table.column before promoting it to sl_refs or quoting it in wiki body.
+
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+
 ## Explore WorkUnits
 
 Explore WUs have raw files like `explores/<model>/<explore>.json` and usually depend on `lookml_models.json`.

packages/context/skills/lookml_ingest/SKILL.md

@@ -51,10 +51,47 @@ LookML's `dimension_group: date { type: time; timeframes: [raw, date, week, mont
 
 A prior replay hallucinated `date_date`, `date_week` into `sql:`, `columns:`, and `grain:` across 4+ standalones; every measure on each affected source returned `400 Unrecognized name: date_date` at query time. Preventable.
 
+Verify each sql_table_name from the LookML view with entity_details before
+mapping to an SL source.
+
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+
 **Required flow before writing any overlay or standalone**:
 
 1. Call `sl_discover(<tableName>)` for each base table you're about to touch. That returns the real columns.
-2. If the table isn't in the manifest, fall back to `sql_execution({ sql: "SELECT column_name FROM <dataset>.INFORMATION_SCHEMA.COLUMNS WHERE table_name = '<table>'" })` (session shape — a connection is already pinned by the ingest session).
+2. If the table isn't in the manifest, use the warehouse `connectionName`
+   returned by `discover_data` or the target connection chosen from
+   `sl_discover`, then call a dialect-appropriate SQL probe with that
+   connection name, for example:
+   `sql_execution({connectionName: "warehouse", sql: "SELECT 1 FROM analytics.orders LIMIT 0"})`.
+   Replace `warehouse`, `analytics`, and `orders` with the verified connection,
+   schema or dataset, and table from the WorkUnit evidence.
 3. Use only those names in `sql:`, `columns:`, and `grain:`. Map each `dimension_group` to ONE `{ name: <physical_col>, type: time, role: time }` entry — never one per timeframe.
 
 | LookML input | KTX `columns:` entry |

packages/context/skills/metabase_ingest/SKILL.md

@@ -44,6 +44,37 @@ Use `resultMetadata` to:
 - `lastRunAt`: ISO timestamp of the card's last execution. If null or very old, the card may be dead; prefer skipping over creating a source.
 - `dashboardCount`: number of dashboards referencing the card. Cards with `dashboardCount: 0` and a stale `lastRunAt` are strong skip signals.
 
+Before writing a wiki page derived from a Metabase question SQL, verify each
+schema.table.column mentioned with entity_details.
+
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+
 ## Decision tree
 
 For each card:

packages/context/skills/metricflow_ingest/SKILL.md

@@ -29,6 +29,37 @@ A MetricFlow `semantic_model` maps to an SL source; MetricFlow `measures` map to
 
 Type map: MetricFlow `time` to KTX `time`; `categorical` to `string`; `number` to `number`; `boolean` to `boolean`. Follow `expr` over `name` when both differ — `expr` is the physical column.
 
+Verify each MetricFlow model source table with entity_details before producing
+the corresponding sl_write_source.
+
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+
 ## Flattening `extends:`
 
 Within one WorkUnit, multiple semantic_models linked by `extends:` are guaranteed to be present (the chunker groups them). Resolve inheritance **before** writing:
@@ -49,7 +80,13 @@ The `model:` field on a semantic_model is a string like `ref('table_name')`, `so
 - `source('s','t')` → table name `t`. Verify via `sl_discover(t)`.
 - Literal (no `ref(...)` / `source(...)`) → treat as the table name directly.
 
-If `sl_discover` errors (no such table), fall back to `sql_execution({ sql: "SELECT column_name FROM <dataset>.INFORMATION_SCHEMA.COLUMNS WHERE table_name = '<x>'" })` (session shape — a connection is already pinned by the ingest session). **Never invent column names** — every column in `columns:`, `grain:`, and `sql:` must be sourced from a real probe.
+If `sl_discover` errors because no such table exists, use `discover_data` and
+`entity_details` to find the warehouse target. If a SQL probe is still needed,
+call `sql_execution` with the same warehouse connection name, for example:
+`sql_execution({connectionName: "warehouse", sql: "SELECT 1 FROM analytics.orders LIMIT 0"})`.
+**Never invent column names** - every column in `columns:`, `grain:`, and
+`sql:` must be sourced from raw files, `entity_details`, or a successful SQL
+probe.
 
 After every `sl_write_source`, call `sl_validate`. The warehouse will reject invented columns with `Unrecognized name: <name>` — treat as a hard failure and re-read the schema.
 

packages/context/skills/notion_synthesize/SKILL.md

@@ -67,10 +67,38 @@ Search existing wiki pages for the same `tables:` or `sl_refs:` frontmatter and
 - Do not create SL sources under the Notion connection just because a page mentions a warehouse, dbt, Looker, or Metabase object. Use the mapped warehouse/source connection after discovery, or emit an unmapped fallback and write wiki-only.
 - Distinguish fallback reasons precisely: if a non-Notion warehouse/dbt connection exists but `sl_discover` cannot find the named table/source, use `no_physical_table`; reserve `no_connection_mapping` for cases where there is no plausible non-Notion target connection at all.
 - If `sl_discover` resolves the table/source, do not call `emit_unmapped_fallback` for that table. Use the resolved source for `sl_refs`, overlay edits, or wiki-only documentation.
-- When calling `emit_unmapped_fallback`, pass the table or source identifier as `tableRef` (e.g. `tableRef: "orbit_analytics.customer"`) — the tool generates the canonical detail string from the reason code and `tableRef`. Use the optional `clarification` field only to add context that does not contradict the reason. Do not restate the reason in `clarification`.
+- When calling `emit_unmapped_fallback`, pass the table or source identifier as `tableRef` (e.g. `tableRef: "<schema>.<table>"`) — the tool generates the canonical detail string from the reason code and `tableRef`. Use the optional `clarification` field only to add context that does not contradict the reason. Do not restate the reason in `clarification`.
+
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
 
 ## Tools
 
-Allowed: `read_raw_file`, `read_raw_span`, `wiki_search`, `wiki_read`, `wiki_write`, `sl_discover`, `sl_read_source`, `sl_write_source`, `sl_edit_source`, `sl_validate`, `context_evidence_search`, `context_evidence_read`, `context_evidence_neighbors`, `emit_unmapped_fallback`, `eviction_list`, `context_eviction_decision_write`.
+Allowed: `read_raw_file`, `read_raw_span`, `wiki_search`, `wiki_read`, `wiki_write`, `discover_data`, `entity_details`, `sql_execution`, `sl_discover`, `sl_read_source`, `sl_write_source`, `sl_edit_source`, `sl_validate`, `context_evidence_search`, `context_evidence_read`, `context_evidence_neighbors`, `emit_unmapped_fallback`, `eviction_list`, `context_eviction_decision_write`.
 
 Not allowed: `context_candidate_write`, `context_candidate_mark`.

packages/context/skills/sl/SKILL.md

@@ -13,6 +13,10 @@ This skill covers two parts:
 
 Capture (when and how to add new patterns to the SL) is a separate concern handled by the memory-agent — see the `sl_capture` skill if you are running in capture mode. The research agent **reads** and **queries** the SL via the tools described here; it does not write to it.
 
+For capture-time identifier verification, load `sl_capture`. Synthesis writer
+skills must verify warehouse identifiers with `discover_data`,
+`entity_details`, and `sql_execution` before emitting table or column names.
+
 ---
 
 ## Part 1 — Schema reference

packages/context/skills/sl_capture/SKILL.md

@@ -174,6 +174,37 @@ Wiki-only is correct when the user is documenting *about* the measure
 (definition in business terms, owner, policy, glossary, examples of when to
 use it) without changing its SQL expression or filters.
 
+Before sl_write_source, call entity_details on the target table to confirm
+column names and types match the YAML being written.
+
+## Identifier Verification Protocol
+
+Before writing a wiki page or SL source on any topic:
+
+1. `discover_data({query: "<topic>"})` - see what wikis, SL sources, and raw
+   tables already exist. Prefer updating existing pages over creating new ones.
+
+Before emitting any `schema.table` or `schema.table.column` into a wiki body,
+SL source, `tables:` frontmatter, `sl_refs`, or `emit_unmapped_fallback`:
+
+2. `entity_details({connectionName, targets: [{display: "<identifier>"}]})` -
+   confirm the identifier resolves; inspect native types, FK/PK, and
+   sampleValues.
+3. For literal values from the source, such as status codes or plan tiers,
+   check whether they appear in `entity_details` sampleValues for the relevant
+   column. If sampleValues is short or the sample may have missed real values,
+   run a `sql_execution` probe with the same warehouse connection name:
+   `sql_execution({connectionName, sql: "SELECT DISTINCT <col> FROM <ref> LIMIT 50"})`.
+4. If the candidate identifier still does not resolve, do one of:
+   - Use `sql_execution({connectionName, sql: "SELECT 1 FROM <ref> LIMIT 0"})`.
+     If it errors, the identifier is fictional.
+   - Wrap the identifier in `[unverified - from <rawPath>]` in the wiki body,
+     citing the exact raw path that mentioned it.
+   - When recording `emit_unmapped_fallback` with `no_physical_table`, include
+     the failing probe error in `clarification`.
+5. Never copy `<schema>.<table>` placeholder strings from these instructions
+   into output.
+
 ## Tool sequence
 
 1. `sl_discover` — see what source files exist.
@@ -181,7 +212,7 @@ use it) without changing its SQL expression or filters.
 3. `sl_read_source({ sourceName })` — read the raw YAML before editing.
 4. For modifications: `sl_edit_source({ sourceName, old_string, new_string })` with exact-string replacements. `old_string` must match exactly and be unique in the file.
 5. For new sources or full rewrites: `sl_write_source({ sourceName, content })` with the full YAML content.
-6. For join discovery: `sql_execution({ sql })` to verify the join key exists in both tables and assess cardinality before declaring the join.
+6. For join discovery: use `sql_execution({connectionName: "warehouse", sql: "SELECT count(*) FROM public.orders o JOIN public.customers c ON c.id = o.customer_id LIMIT 20"})` with the target warehouse connection name and dialect-correct table names to verify the join key exists in both tables and assess cardinality before declaring the join.
 7. Cross-reference knowledge: author the edge once on the **wiki** side via `sl_refs: [source_name]` in the page's front-matter. The reverse edge (wiki pages that cite an SL source) is derived automatically by the reconciler — do not add a `knowledge_refs:` field to SL YAMLs.
 8. `sl_validate` — run after writing or editing to surface schema issues, duplicate measure names, and cross-source validation errors. Read-only; the writes are already committed (the squash-at-end flow will collapse them into one commit).
 
@@ -248,7 +279,8 @@ Prior turn: user asked to correlate LTV with protocol count; assistant joined `f
 sl_read_source({ sourceName: "fct_orders" })
   → no joins section yet
 sql_execution({
-  sql: "SELECT COUNT(*), COUNT(DISTINCT a.admin_user_id) FROM fct_orders a JOIN fct_mau_multiprotocol b ON a.admin_user_id = b.admin_user_id LIMIT 1"
+  connectionName: "warehouse",
+  sql: "SELECT COUNT(*), COUNT(DISTINCT a.admin_user_id) FROM public.fct_orders a JOIN public.fct_mau_multiprotocol b ON a.admin_user_id = b.admin_user_id LIMIT 1"
 })
   → confirms cardinality (many orders per MAU row = many_to_one)
 sl_edit_source({

packages/context/src/connections/dialects.test.ts

@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest';
+import { getDialectForDriver } from './dialects.js';
+
+describe('getDialectForDriver', () => {
+  it.each([
+    ['postgres', '"public"."orders"'],
+    ['postgresql', '"public"."orders"'],
+    ['mysql', '`public`.`orders`'],
+    ['clickhouse', '`public`.`orders`'],
+    ['sqlite', '"orders"'],
+    ['snowflake', '"analytics"."public"."orders"'],
+    ['bigquery', '`analytics`.`public`.`orders`'],
+    ['sqlserver', '[analytics].[public].[orders]'],
+  ] as const)('formats table names for %s', (driver, expected) => {
+    const dialect = getDialectForDriver(driver);
+    expect(
+      dialect.formatTableName({
+        catalog: driver === 'snowflake' || driver === 'bigquery' || driver === 'sqlserver' ? 'analytics' : null,
+        db: driver === 'sqlite' ? null : 'public',
+        name: 'orders',
+      }),
+    ).toBe(expected);
+  });
+
+  it('throws with a supported-driver list for unknown drivers', () => {
+    expect(() => getDialectForDriver('oracle')).toThrow(
+      'Unsupported warehouse driver "oracle". Supported drivers: bigquery, clickhouse, mysql, postgres, postgresql, sqlite, sqlite3, snowflake, sqlserver',
+    );
+  });
+});

packages/context/src/connections/dialects.ts

@@ -0,0 +1,102 @@
+import type { KtxSchemaDimensionType, KtxTableRef } from '../scan/types.js';
+
+export type SupportedDriver =
+  | 'postgres'
+  | 'postgresql'
+  | 'mysql'
+  | 'sqlserver'
+  | 'snowflake'
+  | 'bigquery'
+  | 'clickhouse'
+  | 'sqlite'
+  | 'sqlite3';
+
+export interface KtxDialect {
+  readonly type: SupportedDriver;
+  quoteIdentifier(identifier: string): string;
+  formatTableName(table: KtxTableRef): string;
+  mapToDimensionType(nativeType: string): KtxSchemaDimensionType;
+}
+
+const supportedDrivers: SupportedDriver[] = [
+  'bigquery',
+  'clickhouse',
+  'mysql',
+  'postgres',
+  'postgresql',
+  'sqlite',
+  'sqlite3',
+  'snowflake',
+  'sqlserver',
+];
+
+function doubleQuoted(identifier: string): string {
+  return `"${identifier.replace(/"/g, '""')}"`;
+}
+
+function backtickQuoted(identifier: string): string {
+  return `\`${identifier.replace(/`/g, '``')}\``;
+}
+
+function bigQueryQuoted(identifier: string): string {
+  return `\`${identifier.replace(/`/g, '\\`')}\``;
+}
+
+function bracketQuoted(identifier: string): string {
+  return `[${identifier.replace(/\]/g, ']]')}]`;
+}
+
+function inferDimensionType(nativeType: string): KtxSchemaDimensionType {
+  const normalized = nativeType.toLowerCase().trim();
+  if (normalized.includes('date') || normalized.includes('time')) {
+    return 'time';
+  }
+  if (
+    normalized.includes('int') ||
+    normalized.includes('num') ||
+    normalized.includes('dec') ||
+    normalized.includes('float') ||
+    normalized.includes('double') ||
+    normalized.includes('real')
+  ) {
+    return 'number';
+  }
+  if (normalized.includes('bool') || normalized === 'bit') {
+    return 'boolean';
+  }
+  return 'string';
+}
+
+function formatWithParts(table: KtxTableRef, quote: (identifier: string) => string, sqlite = false): string {
+  const parts = sqlite ? [table.name] : [table.catalog, table.db, table.name].filter((part): part is string => !!part);
+  return parts.map(quote).join('.');
+}
+
+function createDialect(type: SupportedDriver, quote: (identifier: string) => string, sqlite = false): KtxDialect {
+  return {
+    type,
+    quoteIdentifier: quote,
+    formatTableName: (table) => formatWithParts(table, quote, sqlite),
+    mapToDimensionType: inferDimensionType,
+  };
+}
+
+const dialects: Record<SupportedDriver, KtxDialect> = {
+  postgres: createDialect('postgres', doubleQuoted),
+  postgresql: createDialect('postgresql', doubleQuoted),
+  mysql: createDialect('mysql', backtickQuoted),
+  clickhouse: createDialect('clickhouse', backtickQuoted),
+  sqlite: createDialect('sqlite', doubleQuoted, true),
+  sqlite3: createDialect('sqlite3', doubleQuoted, true),
+  snowflake: createDialect('snowflake', doubleQuoted),
+  bigquery: createDialect('bigquery', bigQueryQuoted),
+  sqlserver: createDialect('sqlserver', bracketQuoted),
+};
+
+export function getDialectForDriver(driver: string): KtxDialect {
+  const normalized = driver.toLowerCase().trim();
+  if (normalized in dialects) {
+    return dialects[normalized as SupportedDriver];
+  }
+  throw new Error(`Unsupported warehouse driver "${driver}". Supported drivers: ${supportedDrivers.join(', ')}`);
+}

packages/context/src/connections/index.ts

@@ -3,7 +3,9 @@ export type {
   KtxSqlQueryExecutionResult,
   KtxSqlQueryExecutorPort,
 } from './query-executor.js';
+export type { KtxDialect, SupportedDriver } from './dialects.js';
 export { createDefaultLocalQueryExecutor, type DefaultLocalQueryExecutorOptions } from './local-query-executor.js';
+export { getDialectForDriver } from './dialects.js';
 export { normalizeQueryRows } from './query-executor.js';
 export { createPostgresQueryExecutor } from './postgres-query-executor.js';
 export { assertReadOnlySql, limitSqlForExecution } from './read-only-sql.js';

packages/context/src/core/git.service.test.ts

@@ -379,5 +379,37 @@ describe('GitService', () => {
       await service.removeWorktree(wtDir).catch(() => undefined);
       await rm(wtDir, { recursive: true, force: true }).catch(() => undefined);
     });
+
+    it('reports untracked files that would be overwritten by the squash merge', async () => {
+      const { commitHash: baseSha } = await writeAndCommit('seed.md', 'seed');
+      const parent = await realpath(join(tempDir, '..'));
+      const wtDir = join(parent, `wt-${Date.now()}-untracked`);
+      await service.addWorktree(wtDir, 'session/untracked', baseSha);
+
+      const scoped = service.forWorktree(wtDir);
+      await writeFile(join(wtDir, 'knowledge.md'), 'session version\n', 'utf-8');
+      await scoped.commitFile('knowledge.md', 'session write', 'System User', 'system@example.com');
+      await writeFile(join(tempDir, 'knowledge.md'), 'untracked local version\n', 'utf-8');
+
+      const result = await service.squashMergeIntoMain(
+        'session/untracked',
+        'System User',
+        'system@example.com',
+        'Memory capture: 1 file [chat=untracked]',
+      );
+
+      expect(result.ok).toBe(false);
+      if (result.ok) {
+        throw new Error('unreachable');
+      }
+      expect(result.conflict).toBe(true);
+      expect(result.conflictPaths).toEqual(['knowledge.md']);
+
+      const status = await (service as unknown as { git: import('simple-git').SimpleGit }).git.status();
+      expect(status.not_added).toContain('knowledge.md');
+
+      await service.removeWorktree(wtDir).catch(() => undefined);
+      await rm(wtDir, { recursive: true, force: true }).catch(() => undefined);
+    });
   });
 });

packages/context/src/core/git.service.ts

@@ -31,6 +31,40 @@ export type SquashMergeResult =
   | { ok: true; squashSha: string; touchedPaths: string[] }
   | { ok: false; conflict: true; conflictPaths: string[] };
 
+function mergeErrorMessage(error: unknown): string {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return String(error);
+}
+
+function extractUntrackedOverwritePaths(message: string): string[] {
+  const marker = 'The following untracked working tree files would be overwritten by merge:';
+  const markerIndex = message.indexOf(marker);
+  if (markerIndex === -1) {
+    return [];
+  }
+
+  const afterMarker = message.slice(markerIndex + marker.length);
+  const abortIndex = afterMarker.indexOf('Please move or remove them before you merge.');
+  const pathBlock = abortIndex === -1 ? afterMarker : afterMarker.slice(0, abortIndex);
+  return pathBlock
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0 && line !== 'Aborting')
+    .map((line) => line.replace(/^"(.+)"$/, '$1'));
+}
+
+function mergeConflictPaths(unmergedPaths: string[], mergeError: unknown): string[] {
+  const paths = new Set(unmergedPaths);
+  if (mergeError !== null) {
+    for (const path of extractUntrackedOverwritePaths(mergeErrorMessage(mergeError))) {
+      paths.add(path);
+    }
+  }
+  return [...paths];
+}
+
 export class GitService {
   private static readonly mutationQueues = new Map<string, Promise<void>>();
 
@@ -639,10 +673,11 @@ export class GitService {
     }
 
     const unmergedOut = await this.git.raw(['diff', '--name-only', '--diff-filter=U']).catch(() => '');
-    const conflictPaths = unmergedOut
+    const unmergedPaths = unmergedOut
       .split('\n')
       .map((l) => l.trim())
       .filter(Boolean);
+    const conflictPaths = mergeConflictPaths(unmergedPaths, mergeError);
 
     if (conflictPaths.length > 0 || mergeError !== null) {
       // `merge --abort` only works for an in-progress merge; squash sets MERGE_MSG but not
@@ -651,7 +686,7 @@ export class GitService {
       await this.git.raw(['reset', '--hard', 'HEAD']).catch(() => undefined);
       this.logger.warn(
         `squashMergeIntoMain: conflict merging ${branch} — aborted. conflictPaths=${conflictPaths.join(',')}` +
-          (mergeError ? ` error=${mergeError instanceof Error ? mergeError.message : String(mergeError)}` : ''),
+          (mergeError ? ` error=${mergeErrorMessage(mergeError)}` : ''),
       );
       return { ok: false, conflict: true, conflictPaths };
     }

packages/context/src/ingest/adapters/historic-sql/local-ingest-acceptance.test.ts

@@ -277,7 +277,7 @@ describe('historic-SQL local ingest retrieval acceptance', () => {
 
     await expect(readFile(join(project.projectDir, 'semantic-layer/warehouse/_schema/public.yaml'), 'utf-8')).resolves
       .toContain('Analysts repeatedly inspect paid order lifecycle by customer segment.');
-    await expect(readFile(join(project.projectDir, 'knowledge/global/historic-sql/paid-order-lifecycle.md'), 'utf-8'))
+    await expect(readFile(join(project.projectDir, 'knowledge/global/historic-sql-paid-order-lifecycle.md'), 'utf-8'))
       .resolves.toContain('Paid Order Lifecycle');
 
     const reloaded = await loadKtxProject({ projectDir: project.projectDir });
@@ -295,7 +295,7 @@ describe('historic-SQL local ingest retrieval acceptance', () => {
       searchLocalKnowledgePages(reloaded, { query: 'paid order lifecycle', userId: 'local', limit: 5 }),
     ).resolves.toEqual([
       expect.objectContaining({
-        key: 'historic-sql/paid-order-lifecycle',
+        key: 'historic-sql-paid-order-lifecycle',
         summary: 'Paid Order Lifecycle',
         matchReasons: expect.arrayContaining(['lexical']),
       }),

packages/context/src/ingest/adapters/historic-sql/post-processor.ts

@@ -10,7 +10,7 @@ async function commitProjectionChanges(workdir: string): Promise<void> {
   const status = await git.status();
   const paths = status.files
     .map((file) => file.path)
-    .filter((path) => path.startsWith('semantic-layer/') || path.startsWith('knowledge/global/historic-sql/'));
+    .filter((path) => path.startsWith('semantic-layer/') || path.startsWith('knowledge/global/historic-sql'));
   if (paths.length === 0) {
     return;
   }

packages/context/src/ingest/adapters/historic-sql/projection.test.ts

@@ -106,7 +106,7 @@ describe('projectHistoricSqlEvidence', () => {
     await writeJson(workdir, 'raw-sources/warehouse/historic-sql/sync-1/tables/public.customers.json', { table: 'public.customers' });
     await writeText(
       workdir,
-      'knowledge/global/historic-sql/old-order-lifecycle.md',
+      'knowledge/global/historic-sql-old-order-lifecycle.md',
       [
         '---',
         YAML.stringify({
@@ -127,7 +127,7 @@ describe('projectHistoricSqlEvidence', () => {
     );
     await writeText(
       workdir,
-      'knowledge/global/historic-sql/retired-pattern.md',
+      'knowledge/global/historic-sql-retired-pattern.md',
       [
         '---',
         YAML.stringify({
@@ -164,15 +164,15 @@ describe('projectHistoricSqlEvidence', () => {
     const result = await projectHistoricSqlEvidence({ workdir, connectionId: 'warehouse', syncId: 'sync-1', runId: 'run-1' });
 
     expect(result.patternPagesWritten).toBe(1);
-    await expect(readFile(join(workdir, 'knowledge/global/historic-sql/old-order-lifecycle.md'), 'utf-8')).resolves.toContain(
+    await expect(readFile(join(workdir, 'knowledge/global/historic-sql-old-order-lifecycle.md'), 'utf-8')).resolves.toContain(
       'Order Lifecycle Analysis',
     );
-    await expect(readFile(join(workdir, 'knowledge/global/historic-sql/retired-pattern.md'), 'utf-8')).resolves.toContain(
+    await expect(readFile(join(workdir, 'knowledge/global/historic-sql-retired-pattern.md'), 'utf-8')).resolves.toContain(
       'stale_since: "2026-05-11T00:00:00.000Z"',
     );
   });
 
-  it('writes a reappearing pattern to the active slug instead of reusing an archived page key', async () => {
+  it('rewrites a reappearing archived pattern at the flat slug', async () => {
     const workdir = await tempWorkdir();
     await writeJson(workdir, 'raw-sources/warehouse/historic-sql/sync-1/manifest.json', {
       source: 'historic-sql',
@@ -192,7 +192,7 @@ describe('projectHistoricSqlEvidence', () => {
     await writeJson(workdir, 'raw-sources/warehouse/historic-sql/sync-1/tables/public.customers.json', { table: 'public.customers' });
     await writeText(
       workdir,
-      'knowledge/global/historic-sql/_archived/order-lifecycle-analysis.md',
+      'knowledge/global/historic-sql-order-lifecycle-analysis.md',
       [
         '---',
         YAML.stringify({
@@ -230,15 +230,10 @@ describe('projectHistoricSqlEvidence', () => {
     const result = await projectHistoricSqlEvidence({ workdir, connectionId: 'warehouse', syncId: 'sync-1', runId: 'run-1' });
 
     expect(result.patternPagesWritten).toBe(1);
-    await expect(readFile(join(workdir, 'knowledge/global/historic-sql/order-lifecycle-analysis.md'), 'utf-8')).resolves.toContain(
-      'Order Lifecycle Analysis',
-    );
-    await expect(readFile(join(workdir, 'knowledge/global/historic-sql/_archived/order-lifecycle-analysis.md'), 'utf-8')).resolves.toContain(
-      'Archived body',
-    );
-    await expect(
-      readFile(join(workdir, 'knowledge/global/historic-sql/_archived/_archived/order-lifecycle-analysis.md'), 'utf-8'),
-    ).rejects.toMatchObject({ code: 'ENOENT' });
+    const page = await readFile(join(workdir, 'knowledge/global/historic-sql-order-lifecycle-analysis.md'), 'utf-8');
+    expect(page).toContain('Analysts compare order status with customer segment again.');
+    expect(page).not.toContain('Archived body');
+    expect(page).not.toContain('archived');
   });
 
   it('leaves already archived pattern pages stable when they are still absent', async () => {
@@ -259,7 +254,7 @@ describe('projectHistoricSqlEvidence', () => {
     });
     await writeText(
       workdir,
-      'knowledge/global/historic-sql/_archived/retired-pattern.md',
+      'knowledge/global/historic-sql-retired-pattern.md',
       [
         '---',
         YAML.stringify({
@@ -284,12 +279,9 @@ describe('projectHistoricSqlEvidence', () => {
 
     expect(result.archivedPatternPages).toBe(0);
     expect(result.stalePatternPagesMarked).toBe(0);
-    await expect(readFile(join(workdir, 'knowledge/global/historic-sql/_archived/retired-pattern.md'), 'utf-8')).resolves.toContain(
+    await expect(readFile(join(workdir, 'knowledge/global/historic-sql-retired-pattern.md'), 'utf-8')).resolves.toContain(
       'Archived retired body',
     );
-    await expect(readFile(join(workdir, 'knowledge/global/historic-sql/_archived/_archived/retired-pattern.md'), 'utf-8')).rejects.toMatchObject({
-      code: 'ENOENT',
-    });
   });
 
   it('marks missing table usage stale and deletes legacy historic SQL query pages', async () => {
@@ -330,7 +322,7 @@ describe('projectHistoricSqlEvidence', () => {
     });
     await writeText(
       workdir,
-      'knowledge/global/historic-sql/legacy-template.md',
+      'knowledge/global/historic-sql-legacy-template.md',
       [
         '---',
         YAML.stringify({
@@ -365,7 +357,7 @@ describe('projectHistoricSqlEvidence', () => {
       commonJoins: [],
       staleSince: '2026-05-11T00:00:00.000Z',
     });
-    await expect(readFile(join(workdir, 'knowledge/global/historic-sql/legacy-template.md'), 'utf-8')).rejects.toMatchObject({
+    await expect(readFile(join(workdir, 'knowledge/global/historic-sql-legacy-template.md'), 'utf-8')).rejects.toMatchObject({
       code: 'ENOENT',
     });
   });

packages/context/src/ingest/adapters/historic-sql/projection.ts

@@ -37,7 +37,7 @@ interface HistoricSqlPatternPage {
 }
 
 function safeKnowledgeSlug(value: string): string {
-  return value.toLowerCase().replace(/[^a-z0-9/-]+/g, '-').replace(/^-+|-+$/g, '');
+  return value.toLowerCase().replace(/[^a-z0-9_-]+/g, '-').replace(/^-+|-+$/g, '');
 }
 
 async function pathExists(path: string): Promise<boolean> {
@@ -159,7 +159,7 @@ function isLegacyQueryPage(page: HistoricSqlPatternPage): boolean {
 
 function isArchivedPatternPage(page: HistoricSqlPatternPage): boolean {
   const tags = Array.isArray(page.frontmatter.tags) ? page.frontmatter.tags : [];
-  return page.key.startsWith('_archived/') || tags.includes('archived');
+  return tags.includes('archived');
 }
 
 function stringArray(value: unknown): string[] {
@@ -191,6 +191,9 @@ async function loadPatternPages(root: string): Promise<HistoricSqlPatternPage[]>
   const files = await walkFiles(root);
   const pages: HistoricSqlPatternPage[] = [];
   for (const file of files.filter((candidate) => candidate.endsWith('.md'))) {
+    if (file.includes('/')) {
+      continue;
+    }
     const key = file.replace(/\.md$/, '');
     const path = join(root, file);
     const page = parseMarkdownPage(key, path, await readFile(path, 'utf-8'));
@@ -201,6 +204,10 @@ async function loadPatternPages(root: string): Promise<HistoricSqlPatternPage[]>
   return pages;
 }
 
+function historicSqlFlatKey(slug: string): string {
+  return `historic-sql-${safeKnowledgeSlug(slug)}`;
+}
+
 async function currentStagedTables(rawDir: string): Promise<Set<string>> {
   const tablesRoot = join(rawDir, 'tables');
   const files = await walkFiles(tablesRoot);
@@ -276,7 +283,7 @@ export async function projectHistoricSqlEvidence(input: HistoricSqlProjectionInp
     }
   }
 
-  const wikiRoot = join(input.workdir, 'knowledge/global/historic-sql');
+  const wikiRoot = join(input.workdir, 'knowledge/global');
   await mkdir(wikiRoot, { recursive: true });
   const allPages = await loadPatternPages(wikiRoot);
   const activePages = allPages.filter((page) => !isArchivedPatternPage(page));
@@ -286,7 +293,7 @@ export async function projectHistoricSqlEvidence(input: HistoricSqlProjectionInp
   for (const pattern of patternEvidence) {
     const incomingSignals = [...pattern.pattern.tablesInvolved, ...pattern.pattern.constituentTemplateIds];
     const reusable = patternPages.find((page) => overlapRatio(incomingSignals, existingPageSignals(page)) >= 0.6);
-    const key = reusable?.key ?? safeKnowledgeSlug(pattern.pattern.slug);
+    const key = reusable?.key ?? historicSqlFlatKey(pattern.pattern.slug);
     const pagePath = join(wikiRoot, `${key}.md`);
     const frontmatter = {
       summary: pattern.pattern.title,
@@ -308,11 +315,12 @@ export async function projectHistoricSqlEvidence(input: HistoricSqlProjectionInp
   for (const page of patternPages) {
     if (writtenKeys.has(page.key)) continue;
     if (shouldArchive(page.frontmatter.stale_since, manifest.fetchedAt, manifest.staleArchiveAfterDays)) {
-      const archivePath = join(wikiRoot, '_archived', `${page.key}.md`);
       const tags = [...new Set([...stringArray(page.frontmatter.tags), 'archived'])];
-      await mkdir(dirname(archivePath), { recursive: true });
-      await writeFile(archivePath, renderMarkdownPage({ ...page.frontmatter, tags }, page.content), 'utf-8');
-      await rm(page.path, { force: true });
+      await writeFile(
+        page.path,
+        renderMarkdownPage({ ...page.frontmatter, tags, archived_since: manifest.fetchedAt }, page.content),
+        'utf-8',
+      );
       result.archivedPatternPages += 1;
       continue;
     }

packages/context/src/ingest/adapters/lookml/lookml.adapter.test.ts

@@ -15,6 +15,18 @@ describe('LookmlSourceAdapter validation sidecars', () => {
 
   afterEach(async () => rm(tmpRoot, { recursive: true, force: true }));
 
+  it('returns configured target warehouse connection ids', async () => {
+    const adapter = new LookmlSourceAdapter({
+      homeDir: join(tmpRoot, 'home'),
+      targetConnectionIds: ['warehouse', 'analytics', 'warehouse'],
+    });
+
+    await expect(adapter.listTargetConnectionIds?.(join(tmpRoot, 'staged'))).resolves.toEqual([
+      'analytics',
+      'warehouse',
+    ]);
+  });
+
   it('writes a partial fetch report and marks mismatched chunks as SL-disallowed', async () => {
     const originRoot = join(tmpRoot, 'origin-src');
     await mkdir(join(originRoot, 'views'), { recursive: true });

packages/context/src/ingest/adapters/lookml/lookml.adapter.ts

@@ -14,6 +14,11 @@ import { parseLookmlPullConfig } from './pull-config.js';
 
 export interface LookmlSourceAdapterDeps {
   homeDir: string;
+  targetConnectionIds?: string[];
+}
+
+function uniqueSorted(values: readonly string[] | undefined): string[] {
+  return [...new Set(values ?? [])].sort((left, right) => left.localeCompare(right));
 }
 
 export class LookmlSourceAdapter implements SourceAdapter {
@@ -43,6 +48,10 @@ export class LookmlSourceAdapter implements SourceAdapter {
     return readLookmlFetchReport(stagedDir);
   }
 
+  async listTargetConnectionIds(_stagedDir: string): Promise<string[]> {
+    return uniqueSorted(this.deps.targetConnectionIds);
+  }
+
   async chunk(stagedDir: string, diffSet?: DiffSet): Promise<ChunkResult> {
     const project = await parseLookmlStagedDir(stagedDir);
     const mismatchedModelNames = await readLookmlMismatchedModelNames(stagedDir);

packages/context/src/ingest/adapters/metricflow/metricflow.adapter.test.ts

@@ -42,6 +42,15 @@ describe('MetricflowSourceAdapter', () => {
     expect(adapter.skillNames).toEqual(['metricflow_ingest']);
   });
 
+  it('returns configured target warehouse connection ids', async () => {
+    const metricflow = new MetricflowSourceAdapter({
+      homeDir: join(tmpRoot, 'cache-home'),
+      targetConnectionIds: ['warehouse', 'analytics', 'warehouse'],
+    });
+
+    await expect(metricflow.listTargetConnectionIds?.(stagedDir)).resolves.toEqual(['analytics', 'warehouse']);
+  });
+
   it('detects a staged dir with a semantic_models YAML', async () => {
     await mkdir(join(stagedDir, 'models'), { recursive: true });
     await writeFile(

packages/context/src/ingest/adapters/metricflow/metricflow.adapter.ts

@@ -9,6 +9,11 @@ import { parseMetricflowPullConfig } from './pull-config.js';
 
 export interface MetricflowSourceAdapterDeps {
   homeDir: string;
+  targetConnectionIds?: string[];
+}
+
+function uniqueSorted(values: readonly string[] | undefined): string[] {
+  return [...new Set(values ?? [])].sort((left, right) => left.localeCompare(right));
 }
 
 export class MetricflowSourceAdapter implements SourceAdapter {
@@ -30,6 +35,10 @@ export class MetricflowSourceAdapter implements SourceAdapter {
     });
   }
 
+  async listTargetConnectionIds(_stagedDir: string): Promise<string[]> {
+    return uniqueSorted(this.deps.targetConnectionIds);
+  }
+
   async chunk(stagedDir: string, diffSet?: DiffSet): Promise<ChunkResult> {
     const project = await parseMetricFlowStagedDir(stagedDir);
     const chunk = await chunkMetricFlowProject(project, { diffSet });

packages/context/src/ingest/adapters/notion/chunk.ts

@@ -8,7 +8,7 @@ const MAX_NOTION_WORK_UNIT_CHARS = 40_000;
 export const NOTION_ORG_KNOWLEDGE_WARNING =
   'Anything accessible to this Notion integration can become organization knowledge.';
 const NOTION_SL_WRITE_GUIDANCE =
-  'Write wiki entries with wiki_write. Wiki keys must be flat slugs like orbit-company-overview, not orbit/company-overview. Search existing wiki pages for the same tables or sl_refs before creating a new page. Only write or edit SL sources after sl_discover/sl_read_source confirms a mapped non-Notion target source; if no mapped target exists, emit_unmapped_fallback and keep the fact wiki-only. Notion dataSourceCount counts Notion databases/data sources only, not warehouse/dbt mappings. If a warehouse/dbt connection exists but the named table or source is absent, use reason no_physical_table rather than no_connection_mapping. Do not create SL sources under the Notion connection just because a page mentions a warehouse table.';
+  'Write wiki entries with wiki_write. Wiki keys must be flat slugs like orbit-company-overview, not orbit/company-overview. Search existing wiki pages, SL sources, and raw warehouse schema for the same tables or sl_refs with discover_data before creating a new page. Only write or edit SL sources after discover_data plus sl_discover/sl_read_source or entity_details confirms a mapped non-Notion target source; if no mapped target exists, emit_unmapped_fallback and keep the fact wiki-only. Notion dataSourceCount counts Notion databases/data sources only, not warehouse/dbt mappings. If a warehouse/dbt connection exists but the named table or source is absent, use reason no_physical_table rather than no_connection_mapping. Do not create SL sources under the Notion connection just because a page mentions a warehouse table.';
 
 async function walk(root: string): Promise<string[]> {
   const entries = await readdir(root, { withFileTypes: true, recursive: true });
@@ -117,7 +117,7 @@ export async function chunkNotionStagedDir(stagedDir: string, diffSet?: DiffSet)
     reconcileNotes: [
       `Notion maxKnowledgeCreatesPerRun=${manifest.maxKnowledgeCreatesPerRun}`,
       `Notion maxKnowledgeUpdatesPerRun=${manifest.maxKnowledgeUpdatesPerRun}`,
-      'Notion dataSourceCount is Notion-only; use sl_discover for warehouse/dbt mapping decisions.',
+      'Notion dataSourceCount is Notion-only; use discover_data/entity_details for warehouse/dbt mapping decisions.',
       'Reconcile Notion wiki pages sharing tables/sl_refs before creating distinct artifacts.',
     ],
     contextReport: {

packages/context/src/ingest/adapters/notion/notion.adapter.test.ts

@@ -52,6 +52,14 @@ describe('NotionSourceAdapter', () => {
     expect(adapter.triageSupported).toBe(true);
   });
 
+  it('returns configured target warehouse connection ids', async () => {
+    const adapter = new NotionSourceAdapter({
+      targetConnectionIds: ['warehouse', 'warehouse', 'analytics'],
+    });
+
+    await expect(adapter.listTargetConnectionIds?.(stagedDir)).resolves.toEqual(['analytics', 'warehouse']);
+  });
+
   it('returns structural triage signals for a staged Notion page', async () => {
     await mkdir(join(stagedDir, 'pages', 'page-1'), { recursive: true });
     await writeFile(
@@ -242,6 +250,8 @@ describe('NotionSourceAdapter', () => {
     });
     expect(result.workUnits[0].notes).toContain('Synthesize durable wiki and SL knowledge');
     expect(result.workUnits[0].notes).toContain('emit_unmapped_fallback');
+    expect(result.workUnits[0].notes).toContain('discover_data');
+    expect(result.workUnits[0].notes).toContain('entity_details');
     expect(result.workUnits[0].notes).toContain('use reason no_physical_table rather than no_connection_mapping');
     expect(result.workUnits[0].notes).toContain('Do not create SL sources under the Notion connection');
     expect(result.workUnits[0].notes).toContain(
@@ -250,7 +260,7 @@ describe('NotionSourceAdapter', () => {
     expect(result.reconcileNotes).toEqual([
       'Notion maxKnowledgeCreatesPerRun=25',
       'Notion maxKnowledgeUpdatesPerRun=20',
-      'Notion dataSourceCount is Notion-only; use sl_discover for warehouse/dbt mapping decisions.',
+      'Notion dataSourceCount is Notion-only; use discover_data/entity_details for warehouse/dbt mapping decisions.',
       'Reconcile Notion wiki pages sharing tables/sl_refs before creating distinct artifacts.',
     ]);
     expect(result.contextReport).toEqual({ capped: false, warnings: [NOTION_ORG_KNOWLEDGE_WARNING] });

packages/context/src/ingest/adapters/notion/notion.adapter.ts

@@ -32,6 +32,11 @@ interface NotionPullSucceededContext {
 export interface NotionSourceAdapterDeps {
   onPullSucceeded?: (ctx: NotionPullSucceededContext) => Promise<void>;
   logger?: NotionFetchLogger;
+  targetConnectionIds?: string[];
+}
+
+function uniqueSorted(values: readonly string[] | undefined): string[] {
+  return [...new Set(values ?? [])].sort((left, right) => left.localeCompare(right));
 }
 
 export class NotionSourceAdapter implements SourceAdapter {
@@ -73,6 +78,10 @@ export class NotionSourceAdapter implements SourceAdapter {
     return describeNotionScope(stagedDir);
   }
 
+  async listTargetConnectionIds(_stagedDir: string): Promise<string[]> {
+    return uniqueSorted(this.deps.targetConnectionIds);
+  }
+
   async getTriageSignals(stagedDir: string, externalId: string): Promise<TriageSignals> {
     const metadata = await this.findMetadataByExternalId(stagedDir, externalId);
     if (!metadata) {

packages/context/src/ingest/ingest-bundle.runner.test.ts

@@ -409,6 +409,38 @@ describe('IngestBundleRunner — Stages 1 → 7', () => {
     );
   });
 
+  it('threads target warehouse connection names into WorkUnit and reconcile tool sessions', async () => {
+    const deps = makeDeps();
+    const sessions: any[] = [];
+    deps.adapter.listTargetConnectionIds = vi.fn().mockResolvedValue(['warehouse']);
+    deps.toolsetFactory.createIngestWuToolset.mockImplementation((toolSession: any) => {
+      sessions.push(toolSession);
+      return {
+        toAiSdkTools: vi.fn().mockReturnValue({}),
+        getAllTools: vi.fn().mockReturnValue([]),
+        getToolNames: vi.fn().mockReturnValue([]),
+      };
+    });
+    deps.agentRunner.runLoop.mockResolvedValue({ stopReason: 'natural' });
+
+    const runner = buildRunner(deps);
+    (runner as any).stageRawFilesStage1 = vi.fn().mockResolvedValue({
+      currentHashes: new Map([['a.yml', 'h1']]),
+      rawDirInWorktree: 'raw-sources/notion/fake/s',
+    });
+    (runner as any).resolveStagedDir = vi.fn().mockResolvedValue('/tmp/stage/upload-x');
+
+    await runner.run({
+      jobId: 'j1',
+      connectionId: 'notion',
+      sourceKey: 'fake',
+      trigger: 'upload',
+      bundleRef: { kind: 'upload', uploadId: 'upload-x' },
+    });
+
+    expect([...sessions[0].allowedConnectionNames].sort()).toEqual(['notion', 'warehouse']);
+  });
+
   it('reuses document evidence indexing and page triage for document WorkUnits', async () => {
     const deps = makeDeps();
     deps.adapter.source = 'notion';
@@ -643,6 +675,14 @@ describe('IngestBundleRunner — Stages 1 → 7', () => {
         });
       }
       if (params.telemetryTags.operationName === 'ingest-bundle-reconcile') {
+        await params.toolSet.record_verification_ledger.execute(
+          {
+            summary: 'Reconciliation emits no warehouse identifiers before fallback recording.',
+            verifiedIdentifiers: [],
+            unverifiedIdentifiers: [],
+          },
+          { toolCallId: 'ledger-1', messages: [] },
+        );
         await params.toolSet.emit_conflict_resolution.execute(
           {
             kind: 'near_duplicate',
@@ -811,6 +851,14 @@ describe('IngestBundleRunner — Stages 1 → 7', () => {
           { path: 'a.yml', startLine: 1, endLine: 2 },
           { toolCallId: 'read-1', messages: [] },
         );
+        await params.toolSet.record_verification_ledger.execute(
+          {
+            summary: 'Wiki write contains no warehouse identifiers.',
+            verifiedIdentifiers: [],
+            unverifiedIdentifiers: [],
+          },
+          { toolCallId: 'ledger-1', messages: [] },
+        );
         await params.toolSet.wiki_write.execute(
           { key: 'knowledge/a.md', content: 'safe summary' },
           { toolCallId: 'wiki-1', messages: [] },
@@ -850,9 +898,9 @@ describe('IngestBundleRunner — Stages 1 → 7', () => {
             {
               unitKey: 'u1',
               path: '/tmp/ktx-test/run/wu-transcripts/j1/u1.jsonl',
-              toolCallCount: 2,
+              toolCallCount: 3,
               errorCount: 0,
-              toolNames: ['read_raw_span', 'wiki_write'],
+              toolNames: ['read_raw_span', 'record_verification_ledger', 'wiki_write'],
             },
           ],
         }),
@@ -864,6 +912,14 @@ describe('IngestBundleRunner — Stages 1 → 7', () => {
     const deps = makeDeps();
     deps.agentRunner.runLoop.mockImplementation(async (params: any) => {
       if (params.telemetryTags.operationName === 'ingest-bundle-wu') {
+        await params.toolSet.record_verification_ledger.execute(
+          {
+            summary: 'Unmapped fallback records an unsupported conversion metric without verified warehouse identifiers.',
+            verifiedIdentifiers: [],
+            unverifiedIdentifiers: [],
+          },
+          { toolCallId: 'ledger-1', messages: [] },
+        );
         await params.toolSet.emit_unmapped_fallback.execute(
           {
             rawPath: 'a.yml',
@@ -920,6 +976,14 @@ describe('IngestBundleRunner — Stages 1 → 7', () => {
     });
     deps.agentRunner.runLoop.mockImplementation(async (params: any) => {
       if (params.telemetryTags.operationName === 'ingest-bundle-reconcile') {
+        await params.toolSet.record_verification_ledger.execute(
+          {
+            summary: 'Reconciliation records conflict, eviction, and fallback decisions without warehouse identifiers.',
+            verifiedIdentifiers: [],
+            unverifiedIdentifiers: [],
+          },
+          { toolCallId: 'ledger-1', messages: [] },
+        );
         await params.toolSet.emit_conflict_resolution.execute(
           {
             kind: 'near_duplicate',

packages/context/src/ingest/ingest-bundle.runner.ts

@@ -53,6 +53,7 @@ import type {
   UnresolvedCardInfo,
   WorkUnit,
 } from './types.js';
+import { repairWikiSlRefs, type WikiSlRefRepairResult } from './wiki-sl-ref-repair.js';
 
 function workUnitToMemoryFlowPlannedWorkUnit(workUnit: WorkUnit): MemoryFlowPlannedWorkUnit {
   return {
@@ -528,6 +529,7 @@ export class IngestBundleRunner {
       let sourceContextReport: { capped?: boolean; warnings?: string[] } | undefined;
       let parseArtifacts: unknown;
       let postProcessorOutcome: IngestReportPostProcessorOutcome | undefined;
+      let wikiSlRefRepairResult: WikiSlRefRepairResult | null = null;
       let reconcileNotes: string[] = [];
       let triageResult: PageTriageRunResult | null = null;
       if (overrideReport) {
@@ -662,6 +664,7 @@ export class IngestBundleRunner {
             touchedSlSources: session.touchedSlSources,
             actions: sessionActions,
             allowedRawPaths: new Set(wu.rawFiles),
+            allowedConnectionNames: new Set(slConnectionIds),
             semanticLayerService: scopedSemanticLayerService,
             wikiService: scopedWikiService,
             configService: sessionWorktree.config,
@@ -898,6 +901,7 @@ export class IngestBundleRunner {
         touchedSlSources: reconcileSession.touchedSlSources,
         actions: reconcileActions,
         allowedRawPaths: reconciliationAllowedRawPaths,
+        allowedConnectionNames: new Set(slConnectionIds),
         semanticLayerService: rcScopedSl,
         wikiService: rcScopedWiki,
         configService: sessionWorktree.config,
@@ -1138,6 +1142,19 @@ export class IngestBundleRunner {
         }
       }
 
+      const repairConnectionIds = [
+        ...new Set([
+          ...slConnectionIds,
+          ...(postProcessorOutcome?.touchedSources ?? []).map((source) => source.connectionId),
+        ]),
+      ].sort();
+      wikiSlRefRepairResult = await repairWikiSlRefs({
+        wikiService: this.deps.wikiService.forWorktree(sessionWorktree.workdir),
+        semanticLayerService: this.deps.semanticLayerService.forWorktree(sessionWorktree.workdir),
+        configService: sessionWorktree.config,
+        connectionIds: repairConnectionIds,
+      });
+
       // Stage 6 — squash commit
       const stage6 = ctx?.startPhase(0.04);
       await stage6?.updateProgress(0.0, 'Saving changes');
@@ -1354,6 +1371,8 @@ export class IngestBundleRunner {
         provenanceRows: reportProvenanceRows,
         toolTranscripts: reportToolTranscripts,
         postProcessor: postProcessorOutcome,
+        wikiSlRefRepairs: wikiSlRefRepairResult.repairs,
+        wikiSlRefRepairWarnings: wikiSlRefRepairResult.warnings,
         ...(reportMemoryFlow ? { memoryFlow: reportMemoryFlow } : {}),
         context: contextReport
           ? {

packages/context/src/ingest/ingest-prompts.test.ts

@@ -29,6 +29,18 @@ describe('ingest prompt assets', () => {
     expect(prompt).not.toMatch(forbiddenProductPattern());
   });
 
+  it('uses shipped warehouse verification tools in the WorkUnit prompt', async () => {
+    const prompt = await readFile(
+      new URL('../../prompts/memory_agent_bundle_ingest_work_unit.md', import.meta.url),
+      'utf-8',
+    );
+
+    expect(prompt).toContain('discover_data');
+    expect(prompt).toContain('entity_details');
+    expect(prompt).not.toContain('wiki_sl_search');
+    expect(prompt).not.toContain('sl_describe_table');
+  });
+
   it('does not route historic-SQL through page-triage prompt examples', async () => {
     const prompt = await readFile(new URL('../../prompts/skills/page_triage_classifier.md', import.meta.url), 'utf-8');
 

packages/context/src/ingest/ingest-runtime-assets.test.ts

@@ -91,4 +91,14 @@ describe('ingest runtime assets', () => {
     expect(body).toContain('cross-table');
     expect(body).not.toMatch(forbiddenProductPattern());
   });
+
+  it('packages identifier verification prompt assets', async () => {
+    const shared = await readFile(join(skillsDir, '_shared', 'identifier-verification.md'), 'utf-8');
+    expect(shared).toContain('## Identifier Verification Protocol');
+    expect(shared).toContain('discover_data');
+    expect(shared).toContain('entity_details');
+    expect(shared).toContain('sql_execution');
+    expect(shared).toContain('sql_execution({connectionName, sql: "SELECT DISTINCT');
+    expect(shared).toContain('sql_execution({connectionName, sql: "SELECT 1 FROM');
+  });
 });

packages/context/src/ingest/local-adapters.test.ts

@@ -498,6 +498,60 @@ describe('local ingest adapters', () => {
     await expect(adapter?.listTargetConnectionIds?.('/tmp/staged-dbt')).resolves.toEqual(['warehouse']);
   });
 
+  it('passes primary warehouse connection ids to the local Notion adapter', async () => {
+    const adapters = createDefaultLocalIngestAdapters(
+      projectWithConnections({
+        notion: {
+          driver: 'notion',
+          auth_token: 'secret',
+          crawl_mode: 'selected_roots',
+          root_page_ids: ['page-1'],
+        },
+        warehouse: {
+          driver: 'postgres',
+          url: 'postgresql://readonly@db.example.test/analytics',
+        },
+        docs: {
+          driver: 'dbt',
+          source_dir: './dbt',
+        },
+      } as never),
+    );
+
+    const notion = adapters.find((adapter) => adapter.source === 'notion');
+
+    await expect(notion?.listTargetConnectionIds?.('/tmp/staged-notion')).resolves.toEqual(['warehouse']);
+  });
+
+  it('passes primary warehouse connection ids to local LookML and MetricFlow adapters', async () => {
+    const adapters = createDefaultLocalIngestAdapters(
+      projectWithConnections({
+        warehouse: {
+          driver: 'postgres',
+          url: 'postgresql://readonly@db.example.test/analytics',
+        },
+        lookml_docs: {
+          driver: 'lookml',
+          lookml: {
+            repoUrl: 'https://github.com/acme/lookml.git',
+          },
+        },
+        metrics_repo: {
+          driver: 'metricflow',
+          metricflow: {
+            repoUrl: 'https://github.com/acme/metrics.git',
+          },
+        },
+      } as never),
+    );
+
+    const lookml = adapters.find((adapter) => adapter.source === 'lookml');
+    const metricflow = adapters.find((adapter) => adapter.source === 'metricflow');
+
+    await expect(lookml?.listTargetConnectionIds?.('/tmp/staged-lookml')).resolves.toEqual(['warehouse']);
+    await expect(metricflow?.listTargetConnectionIds?.('/tmp/staged-metricflow')).resolves.toEqual(['warehouse']);
+  });
+
   it('resolves MetricFlow auth_token_ref without writing literal tokens to config', async () => {
     const project = projectWithConnections({
       metricflow_main: {

packages/context/src/ingest/local-adapters.ts

@@ -88,7 +88,10 @@ export function createDefaultLocalIngestAdapters(
         ...(options.databaseIntrospectionUrl ? { baseUrl: options.databaseIntrospectionUrl } : {}),
       }),
     }),
-    new LookmlSourceAdapter({ homeDir: join(project.projectDir, '.ktx/cache') }),
+    new LookmlSourceAdapter({
+      homeDir: join(project.projectDir, '.ktx/cache'),
+      targetConnectionIds: primaryWarehouseConnectionIds(project),
+    }),
     new DbtSourceAdapter({
       homeDir: join(project.projectDir, '.ktx/cache'),
       targetConnectionIds: primaryWarehouseConnectionIds(project),
@@ -106,8 +109,12 @@ export function createDefaultLocalIngestAdapters(
         },
       },
     }),
-    new MetricflowSourceAdapter({ homeDir: join(project.projectDir, '.ktx/cache') }),
+    new MetricflowSourceAdapter({
+      homeDir: join(project.projectDir, '.ktx/cache'),
+      targetConnectionIds: primaryWarehouseConnectionIds(project),
+    }),
     new NotionSourceAdapter({
+      targetConnectionIds: primaryWarehouseConnectionIds(project),
       ...(options.logger ? { logger: options.logger } : {}),
     }),
   ];

packages/context/src/ingest/local-bundle-ingest.test.ts

@@ -27,6 +27,18 @@ class LookerSlWritingAgentRunner extends AgentRunnerService {
       params.telemetryTags?.operationName === 'ingest-bundle-wu' &&
       params.telemetryTags?.unitKey === 'looker-explore-ecommerce-orders'
     ) {
+      const ledger = params.toolSet.record_verification_ledger;
+      if (!ledger?.execute) {
+        throw new Error('record_verification_ledger tool was not available to the Looker WorkUnit');
+      }
+      await ledger.execute(
+        {
+          summary: 'Test fixture verified Looker explore target identifiers before writing SL.',
+          verifiedIdentifiers: ['prod-warehouse', 'public.orders'],
+          unverifiedIdentifiers: [],
+        },
+        { toolCallId: 'looker-verification-ledger', messages: [] },
+      );
       const slWrite = params.toolSet.sl_write_source;
       if (!slWrite?.execute) {
         throw new Error('sl_write_source tool was not available to the Looker WorkUnit');
@@ -63,6 +75,18 @@ class LookerSlWritingAgentRunner extends AgentRunnerService {
 class WikiWritingAgentRunner extends AgentRunnerService {
   override runLoop = vi.fn(async (params: any) => {
     if (params.telemetryTags?.operationName === 'ingest-bundle-wu') {
+      const ledger = params.toolSet.record_verification_ledger;
+      if (!ledger?.execute) {
+        throw new Error('record_verification_ledger tool was not available to the WorkUnit');
+      }
+      await ledger.execute(
+        {
+          summary: 'Test fixture writes wiki-only context with no warehouse identifiers.',
+          verifiedIdentifiers: [],
+          unverifiedIdentifiers: [],
+        },
+        { toolCallId: 'wiki-verification-ledger', messages: [] },
+      );
       const wikiWrite = params.toolSet.wiki_write;
       if (!wikiWrite?.execute) {
         throw new Error('wiki_write tool was not available to the WorkUnit');
@@ -91,6 +115,18 @@ class WikiWritingAgentRunner extends AgentRunnerService {
 class WikiWritingWithRawPathAgentRunner extends AgentRunnerService {
   override runLoop = vi.fn(async (params: any) => {
     if (params.telemetryTags?.operationName === 'ingest-bundle-wu') {
+      const ledger = params.toolSet.record_verification_ledger;
+      if (!ledger?.execute) {
+        throw new Error('record_verification_ledger tool was not available to the WorkUnit');
+      }
+      await ledger.execute(
+        {
+          summary: 'Test fixture writes wiki-only context with explicit raw provenance and no warehouse identifiers.',
+          verifiedIdentifiers: [],
+          unverifiedIdentifiers: [],
+        },
+        { toolCallId: 'wiki-raw-path-verification-ledger', messages: [] },
+      );
       const wikiWrite = params.toolSet.wiki_write;
       if (!wikiWrite?.execute) {
         throw new Error('wiki_write tool was not available to the WorkUnit');

packages/context/src/ingest/local-bundle-runtime.test.ts

@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { AgentRunnerService } from '../agent/index.js';
 import { initKtxProject, type KtxLocalProject, loadKtxProject } from '../project/index.js';
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { FakeSourceAdapter } from './adapters/fake/fake.adapter.js';
 import { createLocalBundleIngestRuntime } from './local-bundle-runtime.js';
 
@@ -12,6 +12,7 @@ type RuntimeWithConnectionDeps = {
     connections: {
       listEnabledConnections(ids: string[]): Promise<Array<{ id: string; name: string; connectionType: string }>>;
       getConnectionById(connectionId: string): Promise<{ id: string; name: string; connectionType: string } | null>;
+      executeQuery(connectionId: string, sql: string): Promise<unknown>;
     };
   };
 };
@@ -113,6 +114,37 @@ describe('createLocalBundleIngestRuntime', () => {
     ]);
   });
 
+  it('passes project connection config to local ingest query executors', async () => {
+    const agentRunner = new AgentRunnerService({ llmProvider: { getModel: () => ({}) as never } as any });
+    const queryExecutor = {
+      execute: vi.fn(async () => ({
+        headers: ['answer'],
+        rows: [[1]],
+        totalRows: 1,
+        command: 'SELECT',
+        rowCount: 1,
+      })),
+    };
+
+    const runtime = createLocalBundleIngestRuntime({
+      project,
+      adapters: [new FakeSourceAdapter()],
+      agentRunner,
+      queryExecutor,
+    });
+    const connections = (runtime.runner as unknown as RuntimeWithConnectionDeps).deps.connections;
+
+    await expect(connections.executeQuery('warehouse', 'select 1')).resolves.toMatchObject({
+      headers: ['answer'],
+    });
+    expect(queryExecutor.execute).toHaveBeenCalledWith({
+      connectionId: 'warehouse',
+      projectDir: project.projectDir,
+      connection: project.config.connections.warehouse,
+      sql: 'select 1',
+    });
+  });
+
   it('accepts a debug LLM request file when constructing the default agent runner', async () => {
     await writeFile(
       join(project.projectDir, 'ktx.yaml'),

packages/context/src/ingest/local-bundle-runtime.ts

@@ -6,7 +6,7 @@ import type { Tool } from 'ai';
 import YAML from 'yaml';
 import type { AgentRunnerService } from '../agent/index.js';
 import { AgentRunnerService as DefaultAgentRunnerService } from '../agent/index.js';
-import { localConnectionInfoFromConfig } from '../connections/index.js';
+import { localConnectionInfoFromConfig, type KtxSqlQueryExecutorPort } from '../connections/index.js';
 import type { KtxEmbeddingPort, KtxLogger } from '../core/index.js';
 import { noopLogger, SessionWorktreeService } from '../core/index.js';
 import type { KtxSemanticLayerComputePort } from '../daemon/index.js';
@@ -56,6 +56,7 @@ import {
   buildKnowledgeSearchText,
   type KnowledgeEventPort,
   type KnowledgeIndexPort,
+  type KnowledgeIndexPageListing,
   KnowledgeWikiService,
   searchLocalKnowledgePages,
   SqliteKnowledgeIndex,
@@ -77,6 +78,7 @@ import { ContextEvidenceIndexService, SqliteContextEvidenceStore } from './conte
 import { DiffSetService } from './diff-set.service.js';
 import { IngestBundleRunner } from './ingest-bundle.runner.js';
 import { PageTriageService } from './page-triage/index.js';
+import { createWarehouseVerificationTools } from './tools/warehouse-verification/index.js';
 import type {
   IngestBundleRunnerDeps,
   IngestCommitMessagePort,
@@ -103,7 +105,7 @@ export interface CreateLocalBundleIngestRuntimeOptions {
   llmDebugRequestFile?: string;
   memoryModel?: string;
   semanticLayerCompute?: KtxSemanticLayerComputePort;
-  queryExecutor?: { execute(input: { connectionId: string; sql: string; maxRows?: number }): Promise<KtxQueryResult> };
+  queryExecutor?: KtxSqlQueryExecutorPort;
   jobIdFactory?: () => string;
   logger?: KtxLogger;
 }
@@ -169,9 +171,7 @@ class LocalAuthorResolver implements GitAuthorResolverPort {
 class LocalConnectionCatalog implements SlConnectionCatalogPort {
   constructor(
     private readonly project: KtxLocalProject,
-    private readonly queryExecutor?: {
-      execute(input: { connectionId: string; sql: string; maxRows?: number }): Promise<KtxQueryResult>;
-    },
+    private readonly queryExecutor?: KtxSqlQueryExecutorPort,
   ) {}
 
   async listEnabledConnections(ids: string[]): Promise<KtxConnectionInfo[]> {
@@ -192,7 +192,12 @@ class LocalConnectionCatalog implements SlConnectionCatalogPort {
     if (!this.queryExecutor) {
       throw new Error('Local ingest has no query executor configured');
     }
-    return this.queryExecutor.execute({ connectionId, sql });
+    return this.queryExecutor.execute({
+      connectionId,
+      projectDir: this.project.projectDir,
+      connection: this.project.config.connections[connectionId],
+      sql,
+    });
   }
 }
 
@@ -347,15 +352,19 @@ class LocalKnowledgeIndex implements KnowledgeIndexPort {
 
   async listPagesForUser(
     userId: string,
-  ): Promise<Array<{ page_key: string; summary: string; scope: string; scope_id: string | null }>> {
-    const pages: Array<{ page_key: string; summary: string; scope: string; scope_id: string | null }> = [];
+  ): Promise<KnowledgeIndexPageListing[]> {
+    const pages: KnowledgeIndexPageListing[] = [];
     for (const scope of [
       { scope: 'GLOBAL', scopeId: null, dir: 'knowledge/global' },
       { scope: 'USER', scopeId: userId, dir: `knowledge/user/${userId}` },
     ]) {
       const listed = await this.project.fileStore.listFiles(scope.dir, true);
       for (const file of listed.files.filter((entry) => entry.endsWith('.md'))) {
-        const pageKey = file.replace(/\.md$/, '');
+        const parsedPath = parseKnowledgeIndexPath(file.startsWith('global/') || file.startsWith('user/') ? file : `${scope.dir.replace('knowledge/', '')}/${file}`);
+        if (!parsedPath || parsedPath.scope !== scope.scope) {
+          continue;
+        }
+        const pageKey = parsedPath.pageKey;
         const raw = await this.project.fileStore.readFile(`${scope.dir}/${file}`);
         const parsed = parseWiki(raw.content);
         pages.push({
@@ -363,6 +372,7 @@ class LocalKnowledgeIndex implements KnowledgeIndexPort {
           summary: parsed.summary,
           scope: scope.scope,
           scope_id: scope.scopeId,
+          tags: parseWikiTags(raw.content),
         });
       }
     }
@@ -432,13 +442,6 @@ function parseKnowledgeIndexPath(file: string): { scope: 'GLOBAL' | 'USER'; page
     const pageKey = segments[1].replace(/\.md$/, '');
     return /^[a-zA-Z0-9][a-zA-Z0-9_-]*$/.test(pageKey) ? { scope: 'GLOBAL', pageKey } : null;
   }
-  if (segments.length >= 3 && segments[0] === 'global' && segments[1] === 'historic-sql') {
-    const historicPath = segments.slice(2).join('/').replace(/\.md$/, '');
-    if (historicPath.split('/').every((segment) => /^[a-zA-Z0-9_][a-zA-Z0-9_-]*$/.test(segment))) {
-      return { scope: 'GLOBAL', pageKey: `historic-sql/${historicPath}` };
-    }
-    return null;
-  }
   if (segments.length === 3 && segments[0] === 'user') {
     const pageKey = segments[2].replace(/\.md$/, '');
     return /^[a-zA-Z0-9][a-zA-Z0-9_-]*$/.test(pageKey) ? { scope: 'USER', pageKey } : null;
@@ -486,38 +489,47 @@ class LocalIngestToolsetFactory implements IngestToolsetFactoryPort {
       slSearchService: deps.slSearchService,
       authorResolver: deps.authorResolver,
     };
+    const wikiSearchTool = new WikiSearchTool({
+      search: async (input) => {
+        const results = await searchLocalKnowledgePages(deps.project, {
+          userId: input.userId,
+          query: input.query,
+          limit: input.limit,
+          embeddingService: deps.embedding,
+        });
+        return {
+          results: results.slice(0, input.limit).map((result) => ({
+            key: result.key,
+            path: result.path,
+            summary: result.summary,
+            score: result.score,
+            matchReasons: result.matchReasons,
+            lanes: result.lanes,
+          })),
+          totalFound: results.length,
+        };
+      },
+    });
+    const slDiscoverTool = new SlDiscoverTool(slDeps, { maxSources: 25, minRrfScore: 0, maxDetailedSources: 5 });
+    const warehouseVerificationTools = createWarehouseVerificationTools({
+      connections: deps.connections,
+      fallbackFileStore: deps.project.fileStore,
+      wikiSearchTool,
+      slDiscoverTool,
+    });
     this.baseTools = [
       new WikiReadTool(deps.wikiService, deps.knowledgeIndex),
-      new WikiSearchTool({
-        search: async (input) => {
-          const results = await searchLocalKnowledgePages(deps.project, {
-            userId: input.userId,
-            query: input.query,
-            limit: input.limit,
-            embeddingService: deps.embedding,
-          });
-          return {
-            results: results.slice(0, input.limit).map((result) => ({
-              key: result.key,
-              path: result.path,
-              summary: result.summary,
-              score: result.score,
-              matchReasons: result.matchReasons,
-              lanes: result.lanes,
-            })),
-            totalFound: results.length,
-          };
-        },
-      }),
-      new WikiListTagsTool(deps.wikiService, deps.knowledgeIndex),
+      wikiSearchTool,
+      new WikiListTagsTool(deps.knowledgeIndex),
       new WikiWriteTool(deps.wikiService, deps.knowledgeIndex, deps.knowledgeEvents),
       new WikiRemoveTool(deps.wikiService, deps.knowledgeIndex, deps.knowledgeEvents),
-      new SlDiscoverTool(slDeps, { maxSources: 25, minRrfScore: 0, maxDetailedSources: 5 }),
+      slDiscoverTool,
       new SlEditSourceTool(slDeps),
       new SlReadSourceTool(slDeps),
       new SlWriteSourceTool(slDeps),
       new SlValidateTool(slDeps),
       new SlRollbackTool(deps.slSourcesRepository, deps.connections, 0),
+      ...warehouseVerificationTools,
     ];
     this.contextTools = [
       new ContextEvidenceSearchTool(deps.contextStore, deps.embedding),

packages/context/src/ingest/local-ingest.ts

@@ -3,11 +3,11 @@ import { cp, mkdir, rm } from 'node:fs/promises';
 import { isAbsolute, resolve } from 'node:path';
 import type { KtxLlmProvider } from '@ktx/llm';
 import type { AgentRunnerService } from '../agent/index.js';
+import type { KtxSqlQueryExecutorPort } from '../connections/index.js';
 import type { KtxLogger } from '../core/index.js';
 import type { KtxSemanticLayerComputePort } from '../daemon/index.js';
 import type { KtxLocalProject } from '../project/index.js';
 import { ktxLocalStateDbPath } from '../project/index.js';
-import type { KtxQueryResult } from '../sl/index.js';
 import { planMetabaseFanoutChildren } from './adapters/metabase/fanout-planner.js';
 import { LocalMetabaseSourceStateReader } from './adapters/metabase/local-source-state-store.js';
 import { localPullConfigForAdapter, type DefaultLocalIngestAdaptersOptions } from './local-adapters.js';
@@ -34,7 +34,7 @@ export interface RunLocalIngestOptions {
   llmDebugRequestFile?: string;
   memoryModel?: string;
   semanticLayerCompute?: KtxSemanticLayerComputePort;
-  queryExecutor?: { execute(input: { connectionId: string; sql: string; maxRows?: number }): Promise<KtxQueryResult> };
+  queryExecutor?: KtxSqlQueryExecutorPort;
   logger?: KtxLogger;
 }
 
@@ -172,7 +172,7 @@ async function runScheduledPullJob(options: {
   llmProvider?: KtxLlmProvider;
   memoryModel?: string;
   semanticLayerCompute?: KtxSemanticLayerComputePort;
-  queryExecutor?: { execute(input: { connectionId: string; sql: string; maxRows?: number }): Promise<KtxQueryResult> };
+  queryExecutor?: KtxSqlQueryExecutorPort;
   logger?: KtxLogger;
 }): Promise<LocalIngestResult> {
   const runtime = createLocalBundleIngestRuntime(options);

packages/context/src/ingest/reports.ts

@@ -9,6 +9,7 @@ import type {
   StageIndex,
   UnmappedFallbackRecord,
 } from './stages/stage-index.types.js';
+import type { WikiSlRefRepair } from './wiki-sl-ref-repair.js';
 import type { IngestDiffSummary, SourceFetchReport, UnresolvedCardInfo } from './types.js';
 
 export interface IngestReportWorkUnit {
@@ -70,6 +71,8 @@ export interface IngestReportBody {
   provenanceRows: IngestReportProvenanceDetail[];
   toolTranscripts: IngestReportToolTranscriptSummary[];
   postProcessor?: IngestReportPostProcessorOutcome;
+  wikiSlRefRepairs?: WikiSlRefRepair[];
+  wikiSlRefRepairWarnings?: string[];
   memoryFlow?: MemoryFlowReplayInput;
 }
 

packages/context/src/ingest/stages/build-reconcile-context.test.ts

@@ -107,6 +107,7 @@ describe('buildReconcileToolSet', () => {
         'eviction_list',
         'load_skill',
         'read_raw_span',
+        'record_verification_ledger',
         'sl_write_source',
         'stage_diff',
         'stage_list',
@@ -114,4 +115,54 @@ describe('buildReconcileToolSet', () => {
       ].sort(),
     );
   });
+
+  it('requires the verification ledger before reconciliation write tools run', async () => {
+    const slWrite = vi.fn().mockResolvedValue({ markdown: 'written', structured: { success: true } });
+    const toolSet = buildReconcileToolSet({
+      loadSkillTool: { load_skill: { description: 'load', inputSchema: {} as any, execute: vi.fn() } } as any,
+      stageListTool: { stage_list: { description: 'stage list', inputSchema: {} as any, execute: vi.fn() } } as any,
+      stageDiffTool: { stage_diff: { description: 'stage diff', inputSchema: {} as any, execute: vi.fn() } } as any,
+      evictionListTool: {
+        eviction_list: { description: 'eviction list', inputSchema: {} as any, execute: vi.fn() },
+      } as any,
+      emitConflictResolutionTool: {
+        emit_conflict_resolution: { description: 'conflict', inputSchema: {} as any, execute: vi.fn() },
+      } as any,
+      emitEvictionDecisionTool: {
+        emit_eviction_decision: { description: 'eviction', inputSchema: {} as any, execute: vi.fn() },
+      } as any,
+      emitArtifactResolutionTool: {
+        emit_artifact_resolution: { description: 'resolution', inputSchema: {} as any, execute: vi.fn() },
+      } as any,
+      emitUnmappedFallbackTool: {
+        emit_unmapped_fallback: { description: 'fallback', inputSchema: {} as any, execute: vi.fn() },
+      } as any,
+      readRawSpanTool: { read_raw_span: { description: 'raw span', inputSchema: {} as any, execute: vi.fn() } } as any,
+      toolsetTools: { sl_write_source: { description: 'sl write', inputSchema: {} as any, execute: slWrite } as any },
+    });
+
+    const correction = await toolSet.sl_write_source.execute?.(
+      { connectionId: 'warehouse', sourceName: 'accounts' },
+      { toolCallId: 't1' } as any,
+    );
+
+    expect(slWrite).not.toHaveBeenCalled();
+    expect(correction).toMatchObject({ structured: { success: false, reason: 'verification_ledger_required' } });
+
+    await toolSet.record_verification_ledger.execute?.(
+      {
+        summary: 'Verified warehouse.accounts with entity_details.',
+        verifiedIdentifiers: ['warehouse.accounts'],
+        unverifiedIdentifiers: [],
+      },
+      { toolCallId: 't2' } as any,
+    );
+    const written = await toolSet.sl_write_source.execute?.(
+      { connectionId: 'warehouse', sourceName: 'accounts' },
+      { toolCallId: 't3' } as any,
+    );
+
+    expect(slWrite).toHaveBeenCalledTimes(1);
+    expect(written).toMatchObject({ structured: { success: true } });
+  });
 });

packages/context/src/ingest/stages/build-reconcile-context.ts

@@ -1,5 +1,10 @@
 import type { Tool, ToolSet } from 'ai';
 import { buildCanonicalPinsPromptBlock, type CanonicalPin } from '../canonical-pins.js';
+import {
+  createVerificationLedgerState,
+  VERIFICATION_LEDGER_PROMPT,
+  withVerificationLedger,
+} from '../tools/verification-ledger.tool.js';
 import type { EvictionUnit } from '../types.js';
 import type { StageIndex } from './stage-index.types.js';
 
@@ -12,6 +17,7 @@ export function buildReconcileSystemPrompt(params: {
 }): string {
   return [
     params.baseFraming.trimEnd(),
+    VERIFICATION_LEDGER_PROMPT,
     params.skillsPrompt.trimEnd(),
     buildCanonicalPinsPromptBlock(params.canonicalPins),
     `\n<context>\nsyncId: ${params.syncId}\nsource: ${params.sourceKey}\n</context>`,
@@ -188,16 +194,20 @@ export interface ReconcileToolSetInput {
 }
 
 export function buildReconcileToolSet(input: ReconcileToolSetInput): ToolSet {
-  return {
-    ...input.toolsetTools,
-    ...input.loadSkillTool,
-    ...input.stageListTool,
-    ...input.stageDiffTool,
-    ...input.evictionListTool,
-    ...input.emitConflictResolutionTool,
-    ...input.emitEvictionDecisionTool,
-    ...input.emitArtifactResolutionTool,
-    ...input.emitUnmappedFallbackTool,
-    ...input.readRawSpanTool,
-  };
+  const state = createVerificationLedgerState();
+  return withVerificationLedger(
+    {
+      ...input.toolsetTools,
+      ...input.loadSkillTool,
+      ...input.stageListTool,
+      ...input.stageDiffTool,
+      ...input.evictionListTool,
+      ...input.emitConflictResolutionTool,
+      ...input.emitEvictionDecisionTool,
+      ...input.emitArtifactResolutionTool,
+      ...input.emitUnmappedFallbackTool,
+      ...input.readRawSpanTool,
+    },
+    state,
+  );
 }

packages/context/src/ingest/stages/build-wu-context.test.ts

@@ -68,12 +68,45 @@ describe('buildWuToolSet', () => {
         'load_skill',
         'read_raw_file',
         'read_raw_span',
+        'record_verification_ledger',
         'sl_write_source',
         'wiki_search',
       ].sort(),
     );
   });
 
+  it('requires the verification ledger before write-capable tools run', async () => {
+    const wikiWrite = vi.fn().mockResolvedValue({ markdown: 'written', structured: { success: true } });
+    const toolSet = buildWuToolSet({
+      stagedDir: '/tmp/staged',
+      wu: { unitKey: 'u1', rawFiles: ['a.yml'], peerFileIndex: [], dependencyPaths: [] },
+      loadSkillTool: { load_skill: { description: 'load', inputSchema: {} as any, execute: vi.fn() } } as any,
+      emitUnmappedFallbackTool: {
+        emit_unmapped_fallback: { description: 'fallback', inputSchema: {} as any, execute: vi.fn() },
+      } as any,
+      toolsetTools: { wiki_write: { description: 'write', inputSchema: {} as any, execute: wikiWrite } as any },
+    });
+
+    const correction = await toolSet.wiki_write.execute?.({ key: 'customer-rules' }, { toolCallId: 't1' } as any);
+
+    expect(wikiWrite).not.toHaveBeenCalled();
+    expect(correction).toMatchObject({ structured: { success: false, reason: 'verification_ledger_required' } });
+    expect(String((correction as any).markdown)).toContain('record_verification_ledger');
+
+    await toolSet.record_verification_ledger.execute?.(
+      {
+        summary: 'No warehouse identifiers will be emitted in this wiki write.',
+        verifiedIdentifiers: [],
+        unverifiedIdentifiers: [],
+      },
+      { toolCallId: 't2' } as any,
+    );
+    const written = await toolSet.wiki_write.execute?.({ key: 'customer-rules' }, { toolCallId: 't3' } as any);
+
+    expect(wikiWrite).toHaveBeenCalledTimes(1);
+    expect(written).toMatchObject({ structured: { success: true } });
+  });
+
   it('includes looker_query_to_sl only for Looker WorkUnits', () => {
     const toolSet = buildWuToolSet({
       sourceKey: 'looker',
@@ -93,6 +126,7 @@ describe('buildWuToolSet', () => {
         'looker_query_to_sl',
         'read_raw_file',
         'read_raw_span',
+        'record_verification_ledger',
         'sl_write_source',
         'wiki_search',
       ].sort(),

packages/context/src/ingest/stages/build-wu-context.ts

@@ -4,6 +4,11 @@ import { createLookerQueryToSlTool } from '../adapters/looker/tools/looker-query
 import type { IngestProvenanceRow } from '../ports.js';
 import { createReadRawFileTool } from '../tools/read-raw-file.tool.js';
 import { createReadRawSpanTool } from '../tools/read-raw-span.tool.js';
+import {
+  createVerificationLedgerState,
+  VERIFICATION_LEDGER_PROMPT,
+  withVerificationLedger,
+} from '../tools/verification-ledger.tool.js';
 import type { WorkUnit } from '../types.js';
 
 const PEER_FILE_INDEX_PROMPT_LIMIT = 100;
@@ -24,6 +29,7 @@ export function buildWuSystemPrompt(params: {
 }): string {
   const parts = [
     params.baseFraming.trimEnd(),
+    VERIFICATION_LEDGER_PROMPT,
     params.skillsPrompt.trimEnd(),
     buildCanonicalPinsPromptBlock(params.canonicalPins ?? []),
     `\n<context>\nsyncId: ${params.syncId}\nsource: ${params.sourceKey}\n</context>`,
@@ -100,15 +106,19 @@ function withoutWriteSlTools(toolset: ToolSet, wu: WorkUnit): ToolSet {
 export function buildWuToolSet(input: BuildWuToolSetInput): ToolSet {
   const allowedPaths = new Set<string>([...input.wu.rawFiles, ...input.wu.dependencyPaths]);
   const lookerTools: ToolSet = input.sourceKey === 'looker' ? { looker_query_to_sl: createLookerQueryToSlTool() } : {};
-  return withoutWriteSlTools(
-    {
-      ...input.toolsetTools,
-      ...lookerTools,
-      ...input.loadSkillTool,
-      ...input.emitUnmappedFallbackTool,
-      read_raw_file: createReadRawFileTool({ stagedDir: input.stagedDir, allowedPaths }),
-      read_raw_span: createReadRawSpanTool({ stagedDir: input.stagedDir, allowedPaths }),
-    },
-    input.wu,
+  const state = createVerificationLedgerState();
+  return withVerificationLedger(
+    withoutWriteSlTools(
+      {
+        ...input.toolsetTools,
+        ...lookerTools,
+        ...input.loadSkillTool,
+        ...input.emitUnmappedFallbackTool,
+        read_raw_file: createReadRawFileTool({ stagedDir: input.stagedDir, allowedPaths }),
+        read_raw_span: createReadRawSpanTool({ stagedDir: input.stagedDir, allowedPaths }),
+      },
+      input.wu,
+    ),
+    state,
   );
 }

packages/context/src/ingest/tools/emit-unmapped-fallback.tool.ts

@@ -64,7 +64,7 @@ export function createEmitUnmappedFallbackTool(deps: EmitUnmappedFallbackDeps) {
       tableRef: z
         .string()
         .optional()
-        .describe('The fully-qualified table or source reference that triggered the fallback (e.g. "orbit_analytics.customer"). Used to generate canonical detail text.'),
+        .describe('The fully-qualified table or source reference that triggered the fallback (e.g. "<schema>.<table>"). Used to generate canonical detail text.'),
       clarification: z
         .string()
         .optional()

packages/context/src/ingest/tools/tool-transcript-summary.test.ts

@@ -36,6 +36,28 @@ describe('tool transcript summaries', () => {
     expect(summary.fatalErrorCount).toBe(0);
   });
 
+  it('treats a suggested flat wiki key retry as recovery for an invalid nested key', () => {
+    const summary = createMutableToolTranscriptSummary('wu-1', '/tmp/wu-1.jsonl');
+
+    recordToolTranscriptEntry(
+      summary,
+      entry({
+        input: { key: 'historic-sql/top-accounts-by-contract-arr' },
+        output: { structured: { success: false, key: 'historic-sql/top-accounts-by-contract-arr' } },
+      }),
+    );
+    recordToolTranscriptEntry(
+      summary,
+      entry({
+        input: { key: 'historic-sql-top-accounts-by-contract-arr' },
+        output: { structured: { success: true, key: 'historic-sql-top-accounts-by-contract-arr' } },
+      }),
+    );
+
+    expect(summary.errorCount).toBe(1);
+    expect(summary.fatalErrorCount).toBe(0);
+  });
+
   it('counts unrecovered wiki_remove structured failures as fatal transcript errors', () => {
     const summary = createMutableToolTranscriptSummary('reconcile', '/tmp/reconcile.jsonl');
 

packages/context/src/ingest/tools/tool-transcript-summary.ts

@@ -1,4 +1,5 @@
 import type { ToolCallLogEntry } from './tool-call-logger.js';
+import { isFlatWikiKey, suggestFlatWikiKey } from '../../wiki/keys.js';
 
 export interface MutableToolTranscriptSummary {
   unitKey: string;
@@ -112,7 +113,10 @@ function structuredSuccess(output: unknown): boolean | null {
 
 function wikiTargetKey(entry: ToolCallLogEntry): string | null {
   const key = stringField(recordField(entry.output, 'structured'), 'key') ?? stringField(entry.input, 'key');
-  return key ? `wiki:${key}` : null;
+  if (!key) {
+    return null;
+  }
+  return `wiki:${isFlatWikiKey(key) ? key : suggestFlatWikiKey(key)}`;
 }
 
 function slTargetKey(entry: ToolCallLogEntry): string | null {

packages/context/src/ingest/tools/verification-ledger.tool.ts

@@ -0,0 +1,97 @@
+import { tool, type ToolExecuteFunction, type ToolExecutionOptions, type ToolSet } from 'ai';
+import { z } from 'zod';
+
+const verificationLedgerInputSchema = z.object({
+  summary: z.string().min(1).max(2000),
+  verifiedIdentifiers: z.array(z.string().min(1)).max(100).default([]),
+  unverifiedIdentifiers: z.array(z.string().min(1)).max(100).default([]),
+  notes: z.string().max(2000).optional(),
+});
+
+export interface VerificationLedgerEntry {
+  summary: string;
+  verifiedIdentifiers: string[];
+  unverifiedIdentifiers: string[];
+  notes?: string;
+}
+
+export interface VerificationLedgerState {
+  entries: VerificationLedgerEntry[];
+}
+
+const WRITE_TOOL_NAMES = new Set([
+  'wiki_write',
+  'wiki_remove',
+  'sl_write_source',
+  'sl_edit_source',
+  'emit_unmapped_fallback',
+]);
+
+export const VERIFICATION_LEDGER_PROMPT = `<pre_write_verification>
+Before any write-capable tool call (wiki_write, wiki_remove, sl_write_source, sl_edit_source, emit_unmapped_fallback), call record_verification_ledger.
+The ledger is a model-authored checkpoint, not a deterministic parser gate. Summarize the verification protocol from the loaded skill, list identifiers verified with discover_data/entity_details/sql_execution, and list anything intentionally left unverified. If the write contains no warehouse identifiers, say that explicitly.
+If a write tool returns verification_ledger_required, complete the ledger and retry the write.
+</pre_write_verification>`;
+
+export function createVerificationLedgerState(): VerificationLedgerState {
+  return { entries: [] };
+}
+
+export function withVerificationLedger(tools: ToolSet, state: VerificationLedgerState): ToolSet {
+  const wrapped: ToolSet = {};
+  for (const [name, original] of Object.entries(tools)) {
+    if (!WRITE_TOOL_NAMES.has(name) || typeof original.execute !== 'function') {
+      wrapped[name] = original;
+      continue;
+    }
+    const originalExecute = original.execute;
+    const guardedExecute: ToolExecuteFunction<unknown, unknown> = async (
+      input: unknown,
+      opts: ToolExecutionOptions,
+    ) => {
+      if (state.entries.length === 0) {
+        return verificationRequiredOutput(name);
+      }
+      return (originalExecute as ToolExecuteFunction<unknown, unknown>)(input, opts);
+    };
+    wrapped[name] = { ...original, execute: guardedExecute };
+  }
+  wrapped.record_verification_ledger = createRecordVerificationLedgerTool(state);
+  return wrapped;
+}
+
+function createRecordVerificationLedgerTool(state: VerificationLedgerState) {
+  return tool({
+    description:
+      'Record the pre-write verification ledger required by loaded ingest skills. Call this before wiki/SL/fallback writes to state what was verified, which tool calls support it, and what remains intentionally unverified.',
+    inputSchema: verificationLedgerInputSchema,
+    execute: async (input) => {
+      const entry = verificationLedgerInputSchema.parse(input);
+      state.entries.push(entry);
+      return {
+        markdown:
+          `Verification ledger recorded. Summary: ${entry.summary}\n` +
+          `Verified identifiers: ${entry.verifiedIdentifiers.length ? entry.verifiedIdentifiers.join(', ') : '(none)'}\n` +
+          `Unverified identifiers: ${
+            entry.unverifiedIdentifiers.length ? entry.unverifiedIdentifiers.join(', ') : '(none)'
+          }`,
+        structured: { success: true, entry },
+      };
+    },
+  });
+}
+
+function verificationRequiredOutput(toolName: string) {
+  return {
+    markdown:
+      `Pre-write verification required before calling ${toolName}. ` +
+      'Call record_verification_ledger first. In the ledger, summarize the loaded skill protocol you followed, ' +
+      'list identifiers verified via discover_data/entity_details/sql_execution, and list any identifiers intentionally left unverified. ' +
+      'If the write contains no warehouse identifiers, say that explicitly in the ledger summary.',
+    structured: {
+      success: false,
+      reason: 'verification_ledger_required',
+      toolName,
+    },
+  };
+}

packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.test.ts

@@ -0,0 +1,119 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { BaseTool, ToolContext } from '../../../tools/index.js';
+import { DiscoverDataTool } from './discover-data.tool.js';
+import type { WarehouseCatalogService } from './warehouse-catalog.service.js';
+
+describe('DiscoverDataTool', () => {
+  const wikiSearchTool = { call: vi.fn() } as unknown as BaseTool & { call: ReturnType<typeof vi.fn> };
+  const slDiscoverTool = { call: vi.fn() } as unknown as BaseTool & { call: ReturnType<typeof vi.fn> };
+  const catalog = { searchByName: vi.fn() } as unknown as WarehouseCatalogService & {
+    searchByName: ReturnType<typeof vi.fn>;
+  };
+  const context: ToolContext = {
+    sourceId: 'ingest',
+    messageId: 'm1',
+    userId: 'system',
+    session: { allowedConnectionNames: new Set(['warehouse']) } as any,
+  };
+  const tool = new DiscoverDataTool({
+    wikiSearchTool,
+    slDiscoverTool,
+    catalogFactory: () => catalog,
+  });
+
+  beforeEach(() => {
+    wikiSearchTool.call.mockReset();
+    slDiscoverTool.call.mockReset();
+    catalog.searchByName.mockReset();
+    wikiSearchTool.call.mockResolvedValue({
+      markdown: '- orders wiki',
+      structured: { totalFound: 1, results: [{ key: 'orders' }] },
+    });
+    slDiscoverTool.call.mockResolvedValue({
+      markdown: '- orders source',
+      structured: { totalSources: 1, sources: [{ sourceName: 'orders' }] },
+    });
+    catalog.searchByName.mockResolvedValue([
+      {
+        kind: 'table',
+        connectionName: 'warehouse',
+        ref: { catalog: null, db: 'public', name: 'orders' },
+        display: 'public.orders',
+        matchedOn: 'name',
+      },
+    ]);
+  });
+
+  it('groups wiki, semantic layer, and raw schema hits with routing hints', async () => {
+    const result = await tool.call({ query: 'orders', connectionName: 'warehouse', limit: 5 }, context);
+
+    expect(result.markdown).toContain('## Wiki Pages');
+    expect(result.markdown).toContain('use `wiki_read(blockKey)` for full content');
+    expect(result.markdown).toContain('## Semantic Layer Sources');
+    expect(result.markdown).toContain('use `sl_read_source(sourceName)` for the YAML');
+    expect(result.markdown).toContain('## Raw Warehouse Schema');
+    expect(result.markdown).toContain('use `entity_details({connectionName, targets: [{display}]})`');
+    expect(result.structured.raw?.hits).toHaveLength(1);
+  });
+
+  it('includes connectionName on raw schema hits so entity_details can follow up', async () => {
+    const multiConnectionContext: ToolContext = {
+      ...context,
+      session: { allowedConnectionNames: new Set(['warehouse', 'analytics']) } as any,
+    };
+    catalog.searchByName.mockImplementation(async (connectionName: string, query: string) => [
+      {
+        kind: 'table',
+        connectionName,
+        ref: { catalog: null, db: 'public', name: `${connectionName}_${query}` },
+        display: `public.${connectionName}_${query}`,
+        matchedOn: 'name',
+      },
+    ]);
+
+    const result = await tool.call({ query: 'orders', limit: 10 }, multiConnectionContext);
+
+    expect(catalog.searchByName).toHaveBeenCalledWith('analytics', 'orders', 10);
+    expect(catalog.searchByName).toHaveBeenCalledWith('warehouse', 'orders', 10);
+    expect(result.markdown).toContain('connectionName=analytics');
+    expect(result.markdown).toContain('connectionName=warehouse');
+    expect(result.markdown).toContain(
+      'entity_details({connectionName: "analytics", targets: [{display: "public.analytics_orders"}]})',
+    );
+    expect(result.structured.raw?.hits.map((hit) => hit.connectionName)).toEqual(['analytics', 'warehouse']);
+  });
+
+  it('refuses explicit out-of-scope connection names', async () => {
+    const result = await tool.call({ query: 'orders', connectionName: 'billing' }, context);
+
+    expect(result.markdown).toContain('Connection "billing" is not available to this ingest stage.');
+    expect(result.structured).toEqual({ wiki: null, sl: null, raw: null });
+    expect(wikiSearchTool.call).not.toHaveBeenCalled();
+    expect(slDiscoverTool.call).not.toHaveBeenCalled();
+    expect(catalog.searchByName).not.toHaveBeenCalled();
+  });
+
+  it('delegates sourceName inspect mode to sl_discover only', async () => {
+    slDiscoverTool.call.mockResolvedValueOnce({
+      markdown: 'source detail',
+      structured: { sourceName: 'orders' },
+    });
+
+    const result = await tool.call({ sourceName: 'orders', connectionName: 'warehouse' }, context);
+
+    expect(slDiscoverTool.call).toHaveBeenCalledWith({ sourceName: 'orders', connectionId: 'warehouse' }, context);
+    expect(wikiSearchTool.call).not.toHaveBeenCalled();
+    expect(catalog.searchByName).not.toHaveBeenCalled();
+    expect(result.markdown).toContain('source detail');
+  });
+
+  it('returns the empty-state message when all sections are empty', async () => {
+    wikiSearchTool.call.mockResolvedValueOnce({ markdown: '', structured: { totalFound: 0, results: [] } });
+    slDiscoverTool.call.mockResolvedValueOnce({ markdown: '', structured: { totalSources: 0, sources: [] } });
+    catalog.searchByName.mockResolvedValueOnce([]);
+
+    const result = await tool.call({ query: 'customer source', connectionName: 'warehouse' }, context);
+
+    expect(result.markdown).toContain('No matches for "customer source" across wiki, semantic layer, or raw warehouse schema.');
+  });
+});

packages/context/src/ingest/tools/warehouse-verification/discover-data.tool.ts

@@ -0,0 +1,142 @@
+import { z } from 'zod';
+import { BaseTool, type ToolContext, type ToolOutput } from '../../../tools/index.js';
+import { WarehouseCatalogService, type RawSchemaHit } from './warehouse-catalog.service.js';
+
+const discoverDataInputSchema = z.object({
+  query: z.string().optional(),
+  connectionName: z.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9_-]*$/).optional(),
+  limit: z.number().int().positive().max(50).optional().default(10),
+  sourceName: z.string().optional(),
+});
+
+type DiscoverDataInput = z.input<typeof discoverDataInputSchema>;
+
+export interface DiscoverDataStructured {
+  wiki: unknown | null;
+  sl: unknown | null;
+  raw: { hits: RawSchemaHit[] } | null;
+}
+
+interface DiscoverDataDeps {
+  wikiSearchTool: BaseTool;
+  slDiscoverTool: BaseTool;
+  catalogFactory: (context: ToolContext) => WarehouseCatalogService;
+}
+
+function totalFound(structured: unknown): number {
+  return typeof structured === 'object' &&
+    structured !== null &&
+    'totalFound' in structured &&
+    typeof structured.totalFound === 'number'
+    ? structured.totalFound
+    : 0;
+}
+
+function totalSources(structured: unknown): number {
+  return typeof structured === 'object' &&
+    structured !== null &&
+    'totalSources' in structured &&
+    typeof structured.totalSources === 'number'
+    ? structured.totalSources
+    : 0;
+}
+
+function allowedConnectionNames(context: ToolContext): ReadonlySet<string> | null {
+  return context.session?.allowedConnectionNames ?? null;
+}
+
+export class DiscoverDataTool extends BaseTool<typeof discoverDataInputSchema> {
+  readonly name = 'discover_data';
+
+  constructor(private readonly deps: DiscoverDataDeps) {
+    super();
+  }
+
+  get description(): string {
+    return 'Discover existing wiki pages, semantic layer sources, and raw warehouse schema hits before writing ingest output.';
+  }
+
+  get inputSchema() {
+    return discoverDataInputSchema;
+  }
+
+  async call(input: DiscoverDataInput, context: ToolContext): Promise<ToolOutput<DiscoverDataStructured>> {
+    const allowed = allowedConnectionNames(context);
+    if (input.connectionName && allowed && !allowed.has(input.connectionName)) {
+      return {
+        markdown: `Connection "${input.connectionName}" is not available to this ingest stage.`,
+        structured: { wiki: null, sl: null, raw: null },
+      };
+    }
+
+    if (input.sourceName) {
+      const sl = await this.deps.slDiscoverTool.call(
+        { sourceName: input.sourceName, connectionId: input.connectionName },
+        context,
+      );
+      return { markdown: sl.markdown, structured: { wiki: null, sl: sl.structured, raw: null } };
+    }
+
+    const query = input.query?.trim() || '';
+    const limit = input.limit ?? 10;
+    const parts: string[] = [];
+    let wiki: unknown | null = null;
+    let sl: unknown | null = null;
+    let raw: DiscoverDataStructured['raw'] = null;
+
+    if (query) {
+      const wikiResult = await this.deps.wikiSearchTool.call({ query, limit }, context);
+      if (totalFound(wikiResult.structured) > 0) {
+        parts.push('## Wiki Pages', '> use `wiki_read(blockKey)` for full content', wikiResult.markdown, '');
+        wiki = wikiResult.structured;
+      }
+    }
+
+    const slResult = await this.deps.slDiscoverTool.call(
+      { query: query || undefined, connectionId: input.connectionName },
+      context,
+    );
+    if (totalSources(slResult.structured) > 0) {
+      parts.push(
+        '## Semantic Layer Sources',
+        '> use `sl_read_source(sourceName)` for the YAML, or `entity_details` for warehouse-shape details',
+        slResult.markdown,
+        '',
+      );
+      sl = slResult.structured;
+    }
+
+    const catalog = this.deps.catalogFactory(context);
+    const connections = input.connectionName ? [input.connectionName] : [...(allowed ?? [])].sort();
+    const rawHits: RawSchemaHit[] = [];
+    for (const connectionName of connections) {
+      rawHits.push(...(await catalog.searchByName(connectionName, query, limit)));
+    }
+    if (rawHits.length > 0) {
+      parts.push(
+        '## Raw Warehouse Schema',
+        '> use `entity_details({connectionName, targets: [{display}]})` for full DDL + sample values',
+      );
+      parts.push(
+        rawHits
+          .slice(0, limit)
+          .map(
+            (hit) =>
+              `- ${hit.kind}: ${hit.display} [connectionName=${hit.connectionName}] (matched on ${hit.matchedOn}) - ` +
+              `follow up with \`entity_details({connectionName: "${hit.connectionName}", targets: [{display: "${hit.display}"}]})\``,
+          )
+          .join('\n'),
+      );
+      raw = { hits: rawHits.slice(0, limit) };
+    }
+
+    if (parts.length === 0) {
+      return {
+        markdown: `No matches for "${query}" across wiki, semantic layer, or raw warehouse schema. Try broader terms; this concept may not exist yet.`,
+        structured: { wiki, sl, raw },
+      };
+    }
+
+    return { markdown: parts.join('\n'), structured: { wiki, sl, raw } };
+  }
+}

packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.test.ts

@@ -0,0 +1,192 @@
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { initKtxProject, type KtxLocalProject } from '../../../project/index.js';
+import type { ToolContext } from '../../../tools/index.js';
+import { EntityDetailsTool } from './entity-details.tool.js';
+import { WarehouseCatalogService } from './warehouse-catalog.service.js';
+
+describe('EntityDetailsTool', () => {
+  let tempDir: string;
+  let project: KtxLocalProject;
+  let tool: EntityDetailsTool;
+  let context: ToolContext;
+
+  beforeEach(async () => {
+    tempDir = await mkdtemp(join(tmpdir(), 'ktx-entity-details-'));
+    project = await initKtxProject({ projectDir: join(tempDir, 'project'), projectName: 'warehouse' });
+    await seedLiveDatabaseScan();
+    tool = new EntityDetailsTool(() => new WarehouseCatalogService({ fileStore: project.fileStore }));
+    context = {
+      sourceId: 'ingest',
+      messageId: 'm1',
+      userId: 'system',
+      session: {
+        allowedConnectionNames: new Set(['warehouse']),
+      } as any,
+    };
+  });
+
+  afterEach(async () => {
+    await rm(tempDir, { recursive: true, force: true });
+  });
+
+  async function seedLiveDatabaseScan(connectionName = 'warehouse', syncId = 'sync-1') {
+    const root = `raw-sources/${connectionName}/live-database/${syncId}`;
+    await project.fileStore.writeFile(
+      `${root}/connection.json`,
+      JSON.stringify({ connectionId: connectionName, driver: 'postgres', extractedAt: '2026-05-12T00:00:00.000Z' }, null, 2),
+      'ktx',
+      'ktx@example.com',
+      'seed connection',
+    );
+    await project.fileStore.writeFile(
+      `${root}/tables/orders.json`,
+      JSON.stringify(
+        {
+          catalog: null,
+          db: 'public',
+          name: 'orders',
+          kind: 'table',
+          comment: 'Customer orders',
+          estimatedRows: 12,
+          columns: [
+            {
+              name: 'id',
+              nativeType: 'integer',
+              normalizedType: 'integer',
+              dimensionType: 'number',
+              nullable: false,
+              primaryKey: true,
+              comment: 'Order id',
+            },
+            {
+              name: 'status',
+              nativeType: 'text',
+              normalizedType: 'text',
+              dimensionType: 'string',
+              nullable: false,
+              primaryKey: false,
+              comment: 'Order status',
+            },
+          ],
+          foreignKeys: [],
+        },
+        null,
+        2,
+      ),
+      'ktx',
+      'ktx@example.com',
+      'seed orders',
+    );
+    await project.fileStore.writeFile(
+      `${root}/enrichment/relationship-profile.json`,
+      JSON.stringify(
+        {
+          connectionId: connectionName,
+          driver: 'postgres',
+          tables: [{ table: { catalog: null, db: 'public', name: 'orders' }, rowCount: 12 }],
+          columns: {
+            'orders.status': {
+              table: { catalog: null, db: 'public', name: 'orders' },
+              column: 'status',
+              rowCount: 12,
+              nullCount: 0,
+              distinctCount: 2,
+              nullRate: 0,
+              sampleValues: ['paid', 'refunded'],
+            },
+          },
+        },
+        null,
+        2,
+      ),
+      'ktx',
+      'ktx@example.com',
+      'seed profile',
+    );
+  }
+
+  it('returns scoped table detail for a display target', async () => {
+    const result = await tool.call({ connectionName: 'warehouse', targets: [{ display: 'public.orders' }] }, context);
+
+    expect(result.markdown).toContain('### public.orders');
+    expect(result.markdown).toContain('- status (text, nullable=false)');
+    expect(result.markdown).toContain('sample: ["paid","refunded"]');
+    expect(result.structured.scanAvailable).toBe(true);
+    expect(result.structured.resolved).toHaveLength(1);
+  });
+
+  it('resolves display targets that include a column name', async () => {
+    const result = await tool.call(
+      { connectionName: 'warehouse', targets: [{ display: 'public.orders.status' }] },
+      context,
+    );
+
+    expect(result.markdown).toContain('### public.orders');
+    expect(result.markdown).toContain('- status (text, nullable=false)');
+    expect(result.markdown).not.toContain('- id (integer');
+    expect(result.structured.resolved).toHaveLength(1);
+    expect(result.structured.resolved[0]?.columns.map((column) => column.name)).toEqual(['status']);
+  });
+
+  it('reports missing explicit columns instead of returning an empty column list', async () => {
+    const result = await tool.call(
+      { connectionName: 'warehouse', targets: [{ display: 'public.orders.plan_tier' }] },
+      context,
+    );
+
+    expect(result.markdown).toContain('Column not found in scan: public.orders.plan_tier');
+    expect(result.markdown).toContain('Available columns: id, status');
+    expect(result.structured.resolved).toHaveLength(0);
+    expect(result.structured.missing).toHaveLength(1);
+  });
+
+  it('reports missing structured table targets in model-visible markdown', async () => {
+    const result = await tool.call(
+      {
+        connectionName: 'warehouse',
+        targets: [{ catalog: null, db: 'public', name: 'orderz' }],
+      },
+      context,
+    );
+
+    expect(result.markdown).toContain('Not found in scan: public.orderz');
+    expect(result.markdown).toContain('Closest matches: orders');
+    expect(result.structured.resolved).toHaveLength(0);
+    expect(result.structured.missing).toHaveLength(1);
+  });
+
+  it('reports missing structured column targets in model-visible markdown', async () => {
+    const result = await tool.call(
+      {
+        connectionName: 'warehouse',
+        targets: [{ catalog: null, db: 'public', name: 'orders', column: 'plan_tier' }],
+      },
+      context,
+    );
+
+    expect(result.markdown).toContain('Column not found in scan: public.orders.plan_tier');
+    expect(result.markdown).toContain('Available columns: id, status');
+    expect(result.structured.resolved).toHaveLength(0);
+    expect(result.structured.missing).toHaveLength(1);
+  });
+
+  it('returns a no-scan state distinct from not found', async () => {
+    const result = await tool.call(
+      { connectionName: 'empty', targets: [{ display: 'public.orders' }] },
+      { ...context, session: { ...context.session!, allowedConnectionNames: new Set(['empty']) } },
+    );
+
+    expect(result.markdown).toContain('No live-database scan available for connection "empty"; run `ktx scan` first.');
+    expect(result.structured.scanAvailable).toBe(false);
+  });
+
+  it('refuses out-of-scope connections', async () => {
+    const result = await tool.call({ connectionName: 'billing', targets: [{ display: 'public.orders' }] }, context);
+
+    expect(result.markdown).toContain('Connection "billing" is not available to this ingest stage.');
+    expect(result.structured.scanAvailable).toBe(false);
+  });
+});

packages/context/src/ingest/tools/warehouse-verification/entity-details.tool.ts

@@ -0,0 +1,170 @@
+import { z } from 'zod';
+import type { KtxTableRef } from '../../../scan/types.js';
+import { BaseTool, type ToolContext, type ToolOutput } from '../../../tools/index.js';
+import { WarehouseCatalogService, type TableDetail } from './warehouse-catalog.service.js';
+
+const targetSchema = z.union([
+  z.object({ display: z.string().min(1) }),
+  z.object({
+    catalog: z.string().nullable(),
+    db: z.string().nullable(),
+    name: z.string().min(1),
+    column: z.string().optional(),
+  }),
+]);
+
+const entityDetailsInputSchema = z.object({
+  connectionName: z.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9_-]*$/),
+  targets: z.array(targetSchema).min(1).max(50),
+});
+
+type EntityDetailsInput = z.infer<typeof entityDetailsInputSchema>;
+type EntityDetailsTarget = EntityDetailsInput['targets'][number];
+
+export interface EntityDetailsStructured {
+  resolved: TableDetail[];
+  missing: Array<{ target: unknown; candidates: KtxTableRef[] }>;
+  scanAvailable: boolean;
+}
+
+function allowedConnectionNames(context: ToolContext): ReadonlySet<string> | null {
+  return context.session?.allowedConnectionNames ?? null;
+}
+
+function targetLabel(target: EntityDetailsTarget): string {
+  if ('display' in target) {
+    return target.display;
+  }
+  return [target.catalog, target.db, target.name, target.column].filter((part): part is string => !!part).join('.');
+}
+
+function appendMissingTargetMarkdown(parts: string[], target: EntityDetailsTarget, candidates: KtxTableRef[]): void {
+  parts.push(`Not found in scan: ${targetLabel(target)}`);
+  if (candidates.length > 0) {
+    parts.push(`Closest matches: ${candidates.map((candidate) => candidate.name).join(', ')}`);
+  }
+}
+
+async function resolveTarget(
+  catalog: WarehouseCatalogService,
+  connectionName: string,
+  target: EntityDetailsTarget,
+): Promise<{ resolved: (KtxTableRef & { column?: string }) | null; candidates: KtxTableRef[] }> {
+  if ('display' in target) {
+    return catalog.resolveDisplayTarget(connectionName, target.display);
+  }
+
+  const candidateResolution = await catalog.resolveDisplayTarget(connectionName, targetLabel(target));
+  return {
+    resolved: {
+      catalog: target.catalog,
+      db: target.db,
+      name: target.name,
+      column: target.column,
+    },
+    candidates: candidateResolution.candidates,
+  };
+}
+
+function sampleText(values: string[]): string {
+  return values.length > 0 ? ` - sample: ${JSON.stringify(values.slice(0, 10))}` : '';
+}
+
+function appendTableMarkdown(parts: string[], detail: TableDetail, columnName?: string): void {
+  const columns = columnName ? detail.columns.filter((column) => column.name === columnName) : detail.columns;
+  parts.push(`### ${detail.display}`);
+  parts.push(`Type: ${detail.kind} | Native columns: ${detail.columns.length}`);
+  if (detail.description || detail.comment) {
+    parts.push(`Description: ${detail.description ?? detail.comment}`);
+  }
+  parts.push('', 'Columns:');
+  for (const column of columns) {
+    const pk = column.primaryKey ? ', PK' : '';
+    parts.push(`- ${column.name} (${column.nativeType}, nullable=${column.nullable}${pk})${sampleText(column.sampleValues)}`);
+  }
+  parts.push('');
+}
+
+function findColumn(detail: TableDetail, columnName: string): TableDetail['columns'][number] | null {
+  const normalized = columnName.toLowerCase();
+  return detail.columns.find((column) => column.name.toLowerCase() === normalized) ?? null;
+}
+
+export class EntityDetailsTool extends BaseTool<typeof entityDetailsInputSchema> {
+  readonly name = 'entity_details';
+
+  constructor(private readonly catalogFactory: (context: ToolContext) => WarehouseCatalogService) {
+    super();
+  }
+
+  get description(): string {
+    return 'Verify warehouse tables and columns from the latest live-database scan before writing them into wiki or semantic-layer output.';
+  }
+
+  get inputSchema() {
+    return entityDetailsInputSchema;
+  }
+
+  async call(input: EntityDetailsInput, context: ToolContext): Promise<ToolOutput<EntityDetailsStructured>> {
+    const allowed = allowedConnectionNames(context);
+    if (allowed && !allowed.has(input.connectionName)) {
+      return {
+        markdown: `Connection "${input.connectionName}" is not available to this ingest stage.`,
+        structured: { resolved: [], missing: [], scanAvailable: false },
+      };
+    }
+
+    const catalog = this.catalogFactory(context);
+    const scanAvailable = await catalog.hasScan(input.connectionName);
+    if (!scanAvailable) {
+      return {
+        markdown: `No live-database scan available for connection "${input.connectionName}"; run \`ktx scan\` first.`,
+        structured: { resolved: [], missing: [], scanAvailable: false },
+      };
+    }
+
+    const parts: string[] = [];
+    const resolved: TableDetail[] = [];
+    const missing: EntityDetailsStructured['missing'] = [];
+
+    for (const target of input.targets) {
+      const resolution = await resolveTarget(catalog, input.connectionName, target);
+      if (!resolution.resolved) {
+        missing.push({ target, candidates: resolution.candidates });
+        appendMissingTargetMarkdown(parts, target, resolution.candidates);
+        continue;
+      }
+      const detail = await catalog.getTable({ connectionName: input.connectionName, ...resolution.resolved });
+      if (!detail) {
+        missing.push({ target, candidates: resolution.candidates });
+        appendMissingTargetMarkdown(parts, target, resolution.candidates);
+        continue;
+      }
+      const requestedColumn = resolution.resolved.column;
+      if (requestedColumn) {
+        const column = findColumn(detail, requestedColumn);
+        if (!column) {
+          missing.push({
+            target,
+            candidates: [{ catalog: detail.catalog, db: detail.db, name: detail.name }],
+          });
+          parts.push(`Column not found in scan: ${detail.display}.${requestedColumn}`);
+          parts.push(`Available columns: ${detail.columns.map((candidate) => candidate.name).join(', ')}`);
+          continue;
+        }
+        const scopedDetail = { ...detail, columns: [column] };
+        resolved.push(scopedDetail);
+        appendTableMarkdown(parts, scopedDetail, column.name);
+        continue;
+      }
+
+      resolved.push(detail);
+      appendTableMarkdown(parts, detail);
+    }
+
+    return {
+      markdown: parts.join('\n').trim(),
+      structured: { resolved, missing, scanAvailable: true },
+    };
+  }
+}

packages/context/src/ingest/tools/warehouse-verification/index.ts

@@ -0,0 +1,34 @@
+import type { KtxFileStorePort } from '../../../core/index.js';
+import type { SlConnectionCatalogPort } from '../../../sl/index.js';
+import type { BaseTool, ToolContext } from '../../../tools/index.js';
+import { DiscoverDataTool } from './discover-data.tool.js';
+import { EntityDetailsTool } from './entity-details.tool.js';
+import { SqlExecutionTool } from './sql-execution.tool.js';
+import { WarehouseCatalogService } from './warehouse-catalog.service.js';
+
+export { DiscoverDataTool } from './discover-data.tool.js';
+export { EntityDetailsTool } from './entity-details.tool.js';
+export { SqlExecutionTool } from './sql-execution.tool.js';
+export { WarehouseCatalogService } from './warehouse-catalog.service.js';
+export type { RawSchemaHit, TableDetail, WarehouseColumnDetail } from './warehouse-catalog.service.js';
+
+export function createWarehouseVerificationTools(deps: {
+  connections: SlConnectionCatalogPort;
+  fallbackFileStore: KtxFileStorePort;
+  wikiSearchTool: BaseTool;
+  slDiscoverTool: BaseTool;
+}): BaseTool[] {
+  const catalogFactory = (context: ToolContext) =>
+    new WarehouseCatalogService({
+      fileStore: context.session?.configService ?? deps.fallbackFileStore,
+    });
+  return [
+    new EntityDetailsTool(catalogFactory),
+    new SqlExecutionTool(deps.connections),
+    new DiscoverDataTool({
+      wikiSearchTool: deps.wikiSearchTool,
+      slDiscoverTool: deps.slDiscoverTool,
+      catalogFactory,
+    }),
+  ];
+}

packages/context/src/ingest/tools/warehouse-verification/sql-execution.tool.test.ts

@@ -0,0 +1,54 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { SlConnectionCatalogPort } from '../../../sl/index.js';
+import type { ToolContext } from '../../../tools/index.js';
+import { SqlExecutionTool } from './sql-execution.tool.js';
+
+describe('SqlExecutionTool', () => {
+  const connections = {
+    executeQuery: vi.fn(),
+  } as unknown as SlConnectionCatalogPort & { executeQuery: ReturnType<typeof vi.fn> };
+  const tool = new SqlExecutionTool(connections);
+  const context: ToolContext = {
+    sourceId: 'ingest',
+    messageId: 'm1',
+    userId: 'system',
+    session: { allowedConnectionNames: new Set(['warehouse']) } as any,
+  };
+
+  it('wraps read-only SQL with a capped row limit', async () => {
+    connections.executeQuery.mockResolvedValue({ headers: ['status'], rows: [['paid']], totalRows: 1 });
+
+    const result = await tool.call(
+      { connectionName: 'warehouse', sql: 'select status from public.orders', rowLimit: 5 },
+      context,
+    );
+
+    expect(connections.executeQuery).toHaveBeenCalledWith(
+      'warehouse',
+      'select * from (select status from public.orders) as ktx_query_result limit 5',
+    );
+    expect(result.markdown).toContain('| status |');
+    expect(result.structured.wrappedSql).toContain('limit 5');
+  });
+
+  it.each(['insert into x values (1)', 'drop table x', 'vacuum'])('rejects mutating SQL: %s', async (sql) => {
+    connections.executeQuery.mockClear();
+
+    const result = await tool.call({ connectionName: 'warehouse', sql }, context);
+
+    expect(result.markdown).toContain('Only read-only SELECT/WITH queries can be executed locally.');
+    expect(connections.executeQuery).not.toHaveBeenCalled();
+  });
+
+  it('surfaces connector errors verbatim', async () => {
+    connections.executeQuery.mockRejectedValue(new Error('relation "orbit_analytics.customer" does not exist'));
+
+    const result = await tool.call(
+      { connectionName: 'warehouse', sql: 'select 1 from orbit_analytics.customer', rowLimit: 1 },
+      context,
+    );
+
+    expect(result.markdown).toContain('relation "orbit_analytics.customer" does not exist');
+    expect(result.structured.error).toContain('relation "orbit_analytics.customer" does not exist');
+  });
+});

packages/context/src/ingest/tools/warehouse-verification/sql-execution.tool.ts

@@ -0,0 +1,102 @@
+import { z } from 'zod';
+import { assertReadOnlySql, limitSqlForExecution } from '../../../connections/index.js';
+import type { SlConnectionCatalogPort } from '../../../sl/index.js';
+import { BaseTool, type ToolContext, type ToolOutput } from '../../../tools/index.js';
+
+const sqlExecutionInputSchema = z.object({
+  connectionName: z.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9_-]*$/),
+  sql: z.string().min(1),
+  rowLimit: z.number().int().positive().max(1000).optional().default(100),
+});
+
+type SqlExecutionInput = z.input<typeof sqlExecutionInputSchema>;
+
+export interface SqlExecutionStructured {
+  headers: string[];
+  rows: unknown[][];
+  rowCount: number;
+  truncated: boolean;
+  sql: string;
+  wrappedSql: string;
+  error?: string;
+}
+
+function markdownTable(headers: string[], rows: unknown[][], totalRows: number): string {
+  if (headers.length === 0) {
+    return rows.length === 0 ? 'Query returned no rows.' : JSON.stringify(rows.slice(0, 20));
+  }
+  const visible = rows.slice(0, 20);
+  const lines = [
+    `| ${headers.join(' | ')} |`,
+    `| ${headers.map(() => '---').join(' | ')} |`,
+    ...visible.map((row) => `| ${row.map((value) => String(value ?? '')).join(' | ')} |`),
+  ];
+  if (totalRows > visible.length) {
+    lines.push(`... +${totalRows - visible.length} more rows`);
+  }
+  return lines.join('\n');
+}
+
+export class SqlExecutionTool extends BaseTool<typeof sqlExecutionInputSchema> {
+  readonly name = 'sql_execution';
+
+  constructor(private readonly connections: SlConnectionCatalogPort) {
+    super();
+  }
+
+  get description(): string {
+    return 'Run a single read-only SELECT or WITH probe against an allowed warehouse connection and return a capped markdown table or the warehouse error.';
+  }
+
+  get inputSchema() {
+    return sqlExecutionInputSchema;
+  }
+
+  async call(input: SqlExecutionInput, context: ToolContext): Promise<ToolOutput<SqlExecutionStructured>> {
+    const allowed = context.session?.allowedConnectionNames;
+    if (allowed && !allowed.has(input.connectionName)) {
+      return {
+        markdown: `Connection "${input.connectionName}" is not available to this ingest stage.`,
+        structured: {
+          headers: [],
+          rows: [],
+          rowCount: 0,
+          truncated: false,
+          sql: input.sql,
+          wrappedSql: '',
+          error: 'connection_not_allowed',
+        },
+      };
+    }
+
+    let sql: string;
+    let wrappedSql: string;
+    try {
+      sql = assertReadOnlySql(input.sql);
+      wrappedSql = limitSqlForExecution(sql, input.rowLimit);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      return {
+        markdown: message,
+        structured: { headers: [], rows: [], rowCount: 0, truncated: false, sql: input.sql, wrappedSql: '', error: message },
+      };
+    }
+
+    try {
+      const result = await this.connections.executeQuery(input.connectionName, wrappedSql);
+      const headers = result.headers ?? [];
+      const rows = result.rows ?? [];
+      const rowCount = result.totalRows ?? rows.length;
+      return {
+        markdown: markdownTable(headers, rows, rowCount),
+        structured: { headers, rows, rowCount, truncated: rowCount > rows.length, sql, wrappedSql },
+      };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      return {
+        markdown: `SQL execution failed: ${message}`,
+        structured: { headers: [], rows: [], rowCount: 0, truncated: false, sql, wrappedSql, error: message },
+      };
+    }
+  }
+}

packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.test.ts

@@ -0,0 +1,196 @@
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { initKtxProject, type KtxLocalProject } from '../../../project/index.js';
+import { WarehouseCatalogService } from './warehouse-catalog.service.js';
+
+describe('WarehouseCatalogService', () => {
+  let tempDir: string;
+  let project: KtxLocalProject;
+
+  beforeEach(async () => {
+    tempDir = await mkdtemp(join(tmpdir(), 'ktx-warehouse-catalog-'));
+    project = await initKtxProject({ projectDir: join(tempDir, 'project'), projectName: 'warehouse' });
+  });
+
+  afterEach(async () => {
+    await rm(tempDir, { recursive: true, force: true });
+  });
+
+  async function seedLiveDatabaseScan(connectionName = 'warehouse', syncId = 'sync-2', driver = 'postgres') {
+    const root = `raw-sources/${connectionName}/live-database/${syncId}`;
+    const tableRef = {
+      catalog: driver === 'bigquery' ? 'analytics' : null,
+      db: driver === 'sqlite' ? null : 'public',
+      name: 'orders',
+    };
+    await project.fileStore.writeFile(
+      `${root}/connection.json`,
+      JSON.stringify({ connectionId: connectionName, driver, extractedAt: '2026-05-12T00:00:00.000Z' }, null, 2),
+      'ktx',
+      'ktx@example.com',
+      'seed connection',
+    );
+    await project.fileStore.writeFile(
+      `${root}/tables/orders.json`,
+      JSON.stringify(
+        {
+          catalog: tableRef.catalog,
+          db: tableRef.db,
+          name: tableRef.name,
+          kind: 'table',
+          comment: 'Customer orders',
+          estimatedRows: 12,
+          columns: [
+            {
+              name: 'id',
+              nativeType: 'integer',
+              normalizedType: 'integer',
+              dimensionType: 'number',
+              nullable: false,
+              primaryKey: true,
+              comment: 'Order id',
+            },
+            {
+              name: 'status',
+              nativeType: 'text',
+              normalizedType: 'text',
+              dimensionType: 'string',
+              nullable: false,
+              primaryKey: false,
+              comment: 'Order status',
+            },
+          ],
+          foreignKeys: [],
+        },
+        null,
+        2,
+      ),
+      'ktx',
+      'ktx@example.com',
+      'seed orders',
+    );
+    await project.fileStore.writeFile(
+      `${root}/enrichment/relationship-profile.json`,
+      JSON.stringify(
+        {
+          connectionId: connectionName,
+          driver,
+          sqlAvailable: true,
+          queryCount: 3,
+          tables: [{ table: { catalog: tableRef.catalog, db: tableRef.db, name: tableRef.name }, rowCount: 12 }],
+          columns: {
+            'orders.status': {
+              table: { catalog: tableRef.catalog, db: tableRef.db, name: tableRef.name },
+              column: 'status',
+              nativeType: 'text',
+              normalizedType: 'text',
+              rowCount: 12,
+              nullCount: 0,
+              distinctCount: 2,
+              uniquenessRatio: 0.1667,
+              nullRate: 0,
+              sampleValues: ['paid', 'refunded'],
+              minTextLength: 4,
+              maxTextLength: 8,
+            },
+          },
+          warnings: [],
+        },
+        null,
+        2,
+      ),
+      'ktx',
+      'ktx@example.com',
+      'seed profile',
+    );
+  }
+
+  it('finds the latest sync and merges table schema with relationship profile values', async () => {
+    await seedLiveDatabaseScan('warehouse', 'sync-1');
+    await seedLiveDatabaseScan('warehouse', 'sync-2');
+    const catalog = new WarehouseCatalogService({ fileStore: project.fileStore });
+
+    await expect(catalog.getLatestSyncId('warehouse')).resolves.toBe('sync-2');
+    const detail = await catalog.getTable({ connectionName: 'warehouse', catalog: null, db: 'public', name: 'orders' });
+
+    expect(detail).toMatchObject({
+      connectionName: 'warehouse',
+      display: 'public.orders',
+      rowCount: 12,
+      columns: [
+        { name: 'id', nativeType: 'integer', primaryKey: true },
+        { name: 'status', nativeType: 'text', sampleValues: ['paid', 'refunded'], distinctCount: 2 },
+      ],
+    });
+  });
+
+  it('returns scanAvailable=false when no live-database scan exists', async () => {
+    const catalog = new WarehouseCatalogService({ fileStore: project.fileStore });
+    await expect(catalog.getTable({ connectionName: 'missing', catalog: null, db: 'public', name: 'orders' })).resolves.toBeNull();
+    await expect(catalog.hasScan('missing')).resolves.toBe(false);
+  });
+
+  it('resolves postgres display strings and returns closest candidates for missing tables', async () => {
+    await seedLiveDatabaseScan();
+    const catalog = new WarehouseCatalogService({ fileStore: project.fileStore });
+
+    await expect(catalog.resolveDisplay('warehouse', 'public.orders')).resolves.toMatchObject({
+      resolved: { catalog: null, db: 'public', name: 'orders' },
+      candidates: [],
+      dialect: 'postgres',
+    });
+    await expect(catalog.resolveDisplay('warehouse', 'public.orderz')).resolves.toMatchObject({
+      resolved: null,
+      candidates: [{ name: 'orders' }],
+    });
+  });
+
+  it('treats two-part BigQuery identifiers as ambiguous instead of guessing', async () => {
+    await seedLiveDatabaseScan('warehouse', 'sync-bigquery', 'bigquery');
+    const catalog = new WarehouseCatalogService({ fileStore: project.fileStore });
+
+    await expect(catalog.resolveDisplay('warehouse', 'public.orders')).resolves.toMatchObject({
+      resolved: null,
+      dialect: 'bigquery',
+    });
+  });
+
+  it('resolves postgres column display strings without treating the column as a table', async () => {
+    await seedLiveDatabaseScan();
+    const catalog = new WarehouseCatalogService({ fileStore: project.fileStore });
+
+    await expect(catalog.resolveDisplayTarget('warehouse', 'public.orders.status')).resolves.toMatchObject({
+      resolved: { catalog: null, db: 'public', name: 'orders', column: 'status' },
+      candidates: [],
+      dialect: 'postgres',
+    });
+  });
+
+  it('resolves BigQuery column display strings with four parts', async () => {
+    await seedLiveDatabaseScan('warehouse', 'sync-bigquery', 'bigquery');
+    const catalog = new WarehouseCatalogService({ fileStore: project.fileStore });
+
+    await expect(catalog.resolveDisplayTarget('warehouse', 'analytics.public.orders.status')).resolves.toMatchObject({
+      resolved: { catalog: 'analytics', db: 'public', name: 'orders', column: 'status' },
+      candidates: [],
+      dialect: 'bigquery',
+    });
+  });
+
+  it('searches table names, column names, comments, and descriptions', async () => {
+    await seedLiveDatabaseScan();
+    const catalog = new WarehouseCatalogService({ fileStore: project.fileStore });
+
+    await expect(catalog.searchByName('warehouse', 'status', 10)).resolves.toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          kind: 'column',
+          ref: expect.objectContaining({ db: 'public', name: 'orders', column: 'status' }),
+          matchedOn: 'name',
+        }),
+      ]),
+    );
+  });
+});

packages/context/src/ingest/tools/warehouse-verification/warehouse-catalog.service.ts

@@ -0,0 +1,452 @@
+import { getDialectForDriver } from '../../../connections/index.js';
+import type { KtxFileStorePort } from '../../../core/index.js';
+import type {
+  KtxConnectionDriver,
+  KtxSchemaColumn,
+  KtxSchemaForeignKey,
+  KtxSchemaTable,
+  KtxTableRef,
+} from '../../../scan/types.js';
+
+type CatalogDriver = KtxConnectionDriver | 'sqlite3';
+
+export interface WarehouseCatalogServiceDeps {
+  fileStore: KtxFileStorePort;
+}
+
+export interface WarehouseColumnDetail extends KtxSchemaColumn {
+  descriptions: Record<string, string>;
+  rowCount: number | null;
+  nullCount: number | null;
+  distinctCount: number | null;
+  nullRate: number | null;
+  sampleValues: string[];
+}
+
+export interface TableDetail {
+  connectionName: string;
+  catalog: string | null;
+  db: string | null;
+  name: string;
+  display: string;
+  kind: string;
+  comment: string | null;
+  description: string | null;
+  rowCount: number | null;
+  columns: WarehouseColumnDetail[];
+  foreignKeys: KtxSchemaForeignKey[];
+}
+
+export type RawSchemaHit =
+  | {
+      kind: 'table';
+      connectionName: string;
+      ref: KtxTableRef;
+      display: string;
+      matchedOn: 'name' | 'db' | 'comment' | 'description';
+    }
+  | {
+      kind: 'column';
+      connectionName: string;
+      ref: KtxTableRef & { column: string };
+      display: string;
+      matchedOn: 'name' | 'comment' | 'description';
+    };
+
+export interface DisplayTargetResolution {
+  resolved: (KtxTableRef & { column?: string }) | null;
+  candidates: KtxTableRef[];
+  dialect: string;
+}
+
+interface ConnectionArtifact {
+  driver?: CatalogDriver;
+}
+
+interface RelationshipProfileColumn {
+  table?: KtxTableRef;
+  column?: string;
+  rowCount?: number;
+  nullCount?: number;
+  distinctCount?: number;
+  nullRate?: number;
+  sampleValues?: unknown[];
+}
+
+interface RelationshipProfileArtifact {
+  driver?: CatalogDriver;
+  tables?: Array<{ table?: KtxTableRef; rowCount?: number }>;
+  columns?: Record<string, RelationshipProfileColumn>;
+}
+
+interface ConnectionCatalog {
+  connectionName: string;
+  syncId: string;
+  driver: CatalogDriver;
+  tables: KtxSchemaTable[];
+  profile: RelationshipProfileArtifact | null;
+}
+
+type TableWithDescriptions = KtxSchemaTable & {
+  description?: string | null;
+  descriptions?: Record<string, string>;
+  columns: Array<KtxSchemaColumn & { description?: string | null; descriptions?: Record<string, string> }>;
+};
+
+function normalize(value: string | null | undefined): string {
+  return (value ?? '').toLowerCase();
+}
+
+function refsEqual(left: KtxTableRef, right: KtxTableRef): boolean {
+  return (
+    normalize(left.catalog) === normalize(right.catalog) &&
+    normalize(left.db) === normalize(right.db) &&
+    normalize(left.name) === normalize(right.name)
+  );
+}
+
+function refKey(ref: KtxTableRef): string {
+  return [ref.catalog, ref.db, ref.name].map((part) => normalize(part)).join('.');
+}
+
+function columnKey(ref: KtxTableRef, column: string): string {
+  return `${refKey(ref)}.${normalize(column)}`;
+}
+
+function readJson<T>(content: string): T {
+  return JSON.parse(content) as T;
+}
+
+function cleanIdentifierPart(part: string): string {
+  return part.trim().replace(/^["'`\[]|["'`\]]$/g, '');
+}
+
+function splitDisplay(display: string): string[] {
+  return display
+    .trim()
+    .split('.')
+    .map(cleanIdentifierPart)
+    .filter(Boolean);
+}
+
+function formatDisplay(driver: CatalogDriver, table: KtxTableRef): string {
+  if (driver === 'sqlite' || driver === 'sqlite3') {
+    return table.name;
+  }
+  return [table.catalog, table.db, table.name].filter((part): part is string => Boolean(part)).join('.');
+}
+
+function parseDisplay(driver: CatalogDriver, display: string): KtxTableRef | null {
+  const parts = splitDisplay(display);
+  if (driver === 'sqlite' || driver === 'sqlite3') {
+    return parts.length === 1 ? { catalog: null, db: null, name: parts[0]! } : null;
+  }
+  if (driver === 'bigquery' || driver === 'snowflake' || driver === 'sqlserver') {
+    if (parts.length !== 3) {
+      return null;
+    }
+    return { catalog: parts[0]!, db: parts[1]!, name: parts[2]! };
+  }
+  if (parts.length === 2) {
+    return { catalog: null, db: parts[0]!, name: parts[1]! };
+  }
+  if (parts.length === 3) {
+    return { catalog: parts[0]!, db: parts[1]!, name: parts[2]! };
+  }
+  return parts.length === 1 ? { catalog: null, db: null, name: parts[0]! } : null;
+}
+
+function expectedDisplayPartCount(driver: CatalogDriver): number {
+  if (driver === 'sqlite' || driver === 'sqlite3') {
+    return 1;
+  }
+  if (driver === 'bigquery' || driver === 'snowflake' || driver === 'sqlserver') {
+    return 3;
+  }
+  return 2;
+}
+
+function parseColumnDisplay(driver: CatalogDriver, display: string): (KtxTableRef & { column: string }) | null {
+  const parts = splitDisplay(display);
+  const tablePartCount = expectedDisplayPartCount(driver);
+  if (parts.length !== tablePartCount + 1) {
+    return null;
+  }
+  const column = parts.at(-1);
+  if (!column) {
+    return null;
+  }
+  const table = parseDisplay(driver, parts.slice(0, -1).join('.'));
+  return table ? { ...table, column } : null;
+}
+
+function bestCandidates(tables: KtxSchemaTable[], display: string, limit = 5): KtxTableRef[] {
+  const needle = normalize(splitDisplay(display).at(-1) ?? display);
+  return tables
+    .map((table) => {
+      const name = normalize(table.name);
+      let score = 0;
+      if (name === needle) {
+        score = 100;
+      } else if (name.includes(needle) || needle.includes(name)) {
+        score = 80;
+      } else {
+        const samePrefix = [...name].filter((char, index) => needle[index] === char).length;
+        score = samePrefix / Math.max(name.length, needle.length, 1);
+      }
+      return { table, score };
+    })
+    .filter((entry) => entry.score > 0)
+    .sort((left, right) => right.score - left.score || left.table.name.localeCompare(right.table.name))
+    .slice(0, limit)
+    .map(({ table }) => ({ catalog: table.catalog, db: table.db, name: table.name }));
+}
+
+function firstDescription(descriptions: Record<string, string> | undefined): string | null {
+  return Object.values(descriptions ?? {}).find((value) => value.trim().length > 0) ?? null;
+}
+
+function matchedOnTable(table: TableWithDescriptions, query: string): RawSchemaHit['matchedOn'] | null {
+  const q = normalize(query);
+  if (!q) {
+    return null;
+  }
+  if (normalize(table.name).includes(q)) {
+    return 'name';
+  }
+  if (normalize(table.db).includes(q)) {
+    return 'db';
+  }
+  if (normalize(table.comment).includes(q)) {
+    return 'comment';
+  }
+  if (normalize(firstDescription(table.descriptions) ?? table.description).includes(q)) {
+    return 'description';
+  }
+  return null;
+}
+
+function matchedOnColumn(
+  column: KtxSchemaColumn & { description?: string | null; descriptions?: Record<string, string> },
+  query: string,
+): 'name' | 'comment' | 'description' | null {
+  const q = normalize(query);
+  if (!q) {
+    return null;
+  }
+  if (normalize(column.name).includes(q)) {
+    return 'name';
+  }
+  if (normalize(column.comment).includes(q)) {
+    return 'comment';
+  }
+  if (normalize(firstDescription(column.descriptions) ?? column.description).includes(q)) {
+    return 'description';
+  }
+  return null;
+}
+
+export class WarehouseCatalogService {
+  private readonly catalogs = new Map<string, Promise<ConnectionCatalog | null>>();
+
+  constructor(private readonly deps: WarehouseCatalogServiceDeps) {}
+
+  async hasScan(connectionName: string): Promise<boolean> {
+    return (await this.loadCatalog(connectionName)) !== null;
+  }
+
+  async getLatestSyncId(connectionName: string): Promise<string | null> {
+    return (await this.loadCatalog(connectionName))?.syncId ?? null;
+  }
+
+  async listTables(connectionName: string): Promise<KtxTableRef[]> {
+    const catalog = await this.loadCatalog(connectionName);
+    return catalog?.tables.map((table) => ({ catalog: table.catalog, db: table.db, name: table.name })) ?? [];
+  }
+
+  async getTable(ref: { connectionName: string } & KtxTableRef): Promise<TableDetail | null> {
+    const catalog = await this.loadCatalog(ref.connectionName);
+    if (!catalog) {
+      return null;
+    }
+    const table = catalog.tables.find((candidate) => refsEqual(candidate, ref)) as TableWithDescriptions | undefined;
+    if (!table) {
+      return null;
+    }
+    const profileTables = catalog.profile?.tables ?? [];
+    const profileTable = profileTables.find((candidate) => candidate.table && refsEqual(candidate.table, table));
+    const profileColumns = catalog.profile?.columns ?? {};
+
+    return {
+      connectionName: ref.connectionName,
+      catalog: table.catalog,
+      db: table.db,
+      name: table.name,
+      display: formatDisplay(catalog.driver, table),
+      kind: table.kind,
+      comment: table.comment,
+      description: table.description ?? firstDescription(table.descriptions),
+      rowCount: profileTable?.rowCount ?? table.estimatedRows ?? null,
+      columns: table.columns.map((rawColumn) => {
+        const column = rawColumn as KtxSchemaColumn & {
+          description?: string | null;
+          descriptions?: Record<string, string>;
+        };
+        const profileColumn =
+          profileColumns[columnKey(table, column.name)] ??
+          Object.entries(profileColumns).find(
+            ([key, value]) =>
+              normalize(key) === `${normalize(table.name)}.${normalize(column.name)}` ||
+              (value.table && refsEqual(value.table, table) && normalize(value.column) === normalize(column.name)),
+          )?.[1];
+        return {
+          ...column,
+          descriptions: column.descriptions ?? {},
+          rowCount: profileColumn?.rowCount ?? null,
+          nullCount: profileColumn?.nullCount ?? null,
+          distinctCount: profileColumn?.distinctCount ?? null,
+          nullRate: profileColumn?.nullRate ?? null,
+          sampleValues: (profileColumn?.sampleValues ?? []).map((value) => String(value)),
+        };
+      }),
+      foreignKeys: table.foreignKeys,
+    };
+  }
+
+  async resolveDisplay(
+    connectionName: string,
+    display: string,
+  ): Promise<{
+    resolved: KtxTableRef | null;
+    candidates: KtxTableRef[];
+    dialect: string;
+  }> {
+    const catalog = await this.loadCatalog(connectionName);
+    if (!catalog) {
+      return { resolved: null, candidates: [], dialect: 'unknown' };
+    }
+    const dialect = getDialectForDriver(catalog.driver).type;
+    const parsed = parseDisplay(catalog.driver, display);
+    if (!parsed) {
+      return { resolved: null, candidates: bestCandidates(catalog.tables, display), dialect };
+    }
+    const table = catalog.tables.find((candidate) => refsEqual(candidate, parsed));
+    if (!table) {
+      return { resolved: null, candidates: bestCandidates(catalog.tables, display), dialect };
+    }
+    return { resolved: { catalog: table.catalog, db: table.db, name: table.name }, candidates: [], dialect };
+  }
+
+  async resolveDisplayTarget(connectionName: string, display: string): Promise<DisplayTargetResolution> {
+    const catalog = await this.loadCatalog(connectionName);
+    if (!catalog) {
+      return { resolved: null, candidates: [], dialect: 'unknown' };
+    }
+
+    const dialect = getDialectForDriver(catalog.driver).type;
+    const tableResolution = await this.resolveDisplay(connectionName, display);
+    if (tableResolution.resolved) {
+      return tableResolution;
+    }
+
+    const parsedColumn = parseColumnDisplay(catalog.driver, display);
+    if (!parsedColumn) {
+      return { resolved: null, candidates: bestCandidates(catalog.tables, display), dialect };
+    }
+
+    const table = catalog.tables.find((candidate) => refsEqual(candidate, parsedColumn));
+    if (!table) {
+      return { resolved: null, candidates: bestCandidates(catalog.tables, display), dialect };
+    }
+
+    return {
+      resolved: {
+        catalog: table.catalog,
+        db: table.db,
+        name: table.name,
+        column: parsedColumn.column,
+      },
+      candidates: [],
+      dialect,
+    };
+  }
+
+  async searchByName(connectionName: string, query: string, limit: number): Promise<RawSchemaHit[]> {
+    const catalog = await this.loadCatalog(connectionName);
+    if (!catalog) {
+      return [];
+    }
+    const hits: RawSchemaHit[] = [];
+    for (const table of catalog.tables as TableWithDescriptions[]) {
+      const tableMatch = matchedOnTable(table, query);
+      if (tableMatch) {
+        hits.push({
+          kind: 'table',
+          connectionName,
+          ref: { catalog: table.catalog, db: table.db, name: table.name },
+          display: formatDisplay(catalog.driver, table),
+          matchedOn: tableMatch,
+        });
+      }
+      for (const column of table.columns) {
+        const columnMatch = matchedOnColumn(column, query);
+        if (!columnMatch) {
+          continue;
+        }
+        hits.push({
+          kind: 'column',
+          connectionName,
+          ref: { catalog: table.catalog, db: table.db, name: table.name, column: column.name },
+          display: `${formatDisplay(catalog.driver, table)}.${column.name}`,
+          matchedOn: columnMatch,
+        });
+      }
+    }
+    return hits.slice(0, Math.max(0, limit));
+  }
+
+  private loadCatalog(connectionName: string): Promise<ConnectionCatalog | null> {
+    const existing = this.catalogs.get(connectionName);
+    if (existing) {
+      return existing;
+    }
+    const pending = this.readCatalog(connectionName);
+    this.catalogs.set(connectionName, pending);
+    return pending;
+  }
+
+  private async readCatalog(connectionName: string): Promise<ConnectionCatalog | null> {
+    const root = `raw-sources/${connectionName}/live-database`;
+    const listed = await this.deps.fileStore.listFiles(root);
+    const connectionFiles = listed.files.filter((file) => file.endsWith('/connection.json')).sort();
+    const latestConnectionPath = connectionFiles.at(-1);
+    if (!latestConnectionPath) {
+      return null;
+    }
+    const latestRoot = latestConnectionPath.slice(0, -'/connection.json'.length);
+    const syncId = latestRoot.split('/').at(-1) ?? '';
+    const connection = readJson<ConnectionArtifact>((await this.deps.fileStore.readFile(latestConnectionPath)).content);
+    const tablesListing = await this.deps.fileStore.listFiles(`${latestRoot}/tables`);
+    const tables: KtxSchemaTable[] = [];
+    for (const tablePath of tablesListing.files.filter((file) => file.endsWith('.json')).sort()) {
+      tables.push(readJson<KtxSchemaTable>((await this.deps.fileStore.readFile(tablePath)).content));
+    }
+
+    let profile: RelationshipProfileArtifact | null = null;
+    try {
+      profile = readJson<RelationshipProfileArtifact>(
+        (await this.deps.fileStore.readFile(`${latestRoot}/enrichment/relationship-profile.json`)).content,
+      );
+    } catch {
+      profile = null;
+    }
+
+    return {
+      connectionName,
+      syncId,
+      driver: connection.driver ?? profile?.driver ?? 'postgres',
+      tables,
+      profile,
+    };
+  }
+}

packages/context/src/ingest/wiki-sl-ref-repair.test.ts

@@ -0,0 +1,99 @@
+import { describe, expect, it, vi } from 'vitest';
+import { repairWikiSlRefs } from './wiki-sl-ref-repair.js';
+
+describe('repairWikiSlRefs', () => {
+  it('removes missing measure refs while keeping source, measure, segment, and manifest-backed refs', async () => {
+    type TestPage = { pageKey: string; frontmatter: Record<string, unknown>; content: string };
+    const pages = new Map<string, TestPage>([
+      [
+        'GLOBAL:accounts-at-risk',
+        {
+          pageKey: 'accounts-at-risk',
+          frontmatter: {
+            summary: 'Accounts at risk',
+            usage_mode: 'auto',
+            sl_refs: [
+              'mart_customer_health',
+              'mart_customer_health.high_risk_account_count',
+              'mart_customer_health.medium_risk_account_count',
+              'mart_customer_health.high_risk',
+              'int_procurement_qualifying_actions',
+            ],
+          },
+          content: 'Risk context.',
+        },
+      ],
+    ]);
+    const wikiService = {
+      readPage: vi.fn(async (scope: string, _scopeId: string | null, key: string) => pages.get(`${scope}:${key}`)),
+      writePage: vi.fn(
+        async (
+          scope: string,
+          _scopeId: string | null,
+          key: string,
+          frontmatter: Record<string, unknown>,
+          content: string,
+        ) => {
+        pages.set(`${scope}:${key}`, { pageKey: key, frontmatter, content });
+        },
+      ),
+    };
+    const configService = {
+      listFiles: vi.fn(async () => ({
+        files: ['global/accounts-at-risk.md', 'global/historic-sql/nested-legacy.md'],
+      })),
+    };
+    const semanticLayerService = {
+      loadAllSources: vi.fn(async () => [
+        {
+          name: 'mart_customer_health',
+          grain: [],
+          columns: [],
+          joins: [],
+          measures: [{ name: 'high_risk_account_count', expr: 'count(*)' }],
+          segments: [{ name: 'high_risk', expr: "risk_level = 'high'" }],
+        },
+        {
+          name: 'int_procurement_qualifying_actions',
+          grain: [],
+          columns: [],
+          joins: [],
+          measures: [],
+        },
+      ]),
+    };
+
+    const result = await repairWikiSlRefs({
+      wikiService: wikiService as never,
+      semanticLayerService: semanticLayerService as never,
+      configService: configService as never,
+      connectionIds: ['warehouse'],
+    });
+
+    expect(result.repairs).toEqual([
+      {
+        pageKey: 'accounts-at-risk',
+        scope: 'GLOBAL',
+        scopeId: null,
+        removedRefs: ['mart_customer_health.medium_risk_account_count'],
+      },
+    ]);
+    expect(wikiService.writePage).toHaveBeenCalledWith(
+      'GLOBAL',
+      null,
+      'accounts-at-risk',
+      expect.objectContaining({
+        sl_refs: [
+          'mart_customer_health',
+          'mart_customer_health.high_risk_account_count',
+          'mart_customer_health.high_risk',
+          'int_procurement_qualifying_actions',
+        ],
+      }),
+      'Risk context.',
+      'System User',
+      'system@example.com',
+      'Repair semantic-layer refs: accounts-at-risk',
+    );
+  });
+});

packages/context/src/ingest/wiki-sl-ref-repair.ts

@@ -0,0 +1,140 @@
+import type { KtxFileStorePort } from '../core/index.js';
+import type { SemanticLayerService, SemanticLayerSource } from '../sl/index.js';
+import { isFlatWikiKey } from '../wiki/keys.js';
+import type { KnowledgeWikiService, WikiFrontmatter } from '../wiki/index.js';
+
+const SYSTEM_AUTHOR = 'System User';
+const SYSTEM_EMAIL = 'system@example.com';
+
+export interface WikiSlRefRepair {
+  pageKey: string;
+  scope: 'GLOBAL' | 'USER';
+  scopeId: string | null;
+  removedRefs: string[];
+}
+
+export interface WikiSlRefRepairResult {
+  repairs: WikiSlRefRepair[];
+  warnings: string[];
+}
+
+interface WikiPath {
+  scope: 'GLOBAL' | 'USER';
+  scopeId: string | null;
+  pageKey: string;
+}
+
+function parseKnowledgeFilePath(path: string): WikiPath | null {
+  if (!path.endsWith('.md')) {
+    return null;
+  }
+  const segments = path.split('/');
+  if (segments.length === 2 && segments[0] === 'global') {
+    const pageKey = segments[1].replace(/\.md$/, '');
+    return isFlatWikiKey(pageKey) ? { scope: 'GLOBAL', scopeId: null, pageKey } : null;
+  }
+  if (segments.length === 3 && segments[0] === 'user') {
+    const pageKey = segments[2].replace(/\.md$/, '');
+    return isFlatWikiKey(pageKey) ? { scope: 'USER', scopeId: segments[1], pageKey } : null;
+  }
+  return null;
+}
+
+function entityRefsForSource(source: SemanticLayerSource): string[] {
+  return [
+    source.name,
+    ...(source.measures ?? []).map((measure) => `${source.name}.${measure.name}`),
+    ...(source.segments ?? []).map((segment) => `${source.name}.${segment.name}`),
+  ];
+}
+
+async function loadVisibleSlRefs(
+  semanticLayerService: SemanticLayerService,
+  connectionIds: string[],
+): Promise<{ refs: Set<string>; warnings: string[] }> {
+  const refs = new Set<string>();
+  const warnings: string[] = [];
+  for (const connectionId of connectionIds) {
+    try {
+      for (const source of await semanticLayerService.loadAllSources(connectionId)) {
+        for (const ref of entityRefsForSource(source)) {
+          refs.add(ref);
+        }
+      }
+    } catch (error) {
+      warnings.push(
+        `Skipped wiki sl_refs repair for connection ${connectionId}: ${error instanceof Error ? error.message : String(error)}`,
+      );
+    }
+  }
+  return { refs, warnings };
+}
+
+function uniqueStringArray(value: string[] | undefined): string[] {
+  return [...new Set((value ?? []).filter((entry) => typeof entry === 'string' && entry.trim().length > 0))];
+}
+
+export async function repairWikiSlRefs(input: {
+  wikiService: KnowledgeWikiService;
+  semanticLayerService: SemanticLayerService;
+  configService: KtxFileStorePort;
+  connectionIds: string[];
+}): Promise<WikiSlRefRepairResult> {
+  const { refs: validRefs, warnings } = await loadVisibleSlRefs(input.semanticLayerService, input.connectionIds);
+  const listFiles =
+    typeof input.configService.listFiles === 'function'
+      ? input.configService.listFiles.bind(input.configService)
+      : null;
+  if (!listFiles) {
+    return {
+      repairs: [],
+      warnings: [...warnings, 'Skipped wiki sl_refs repair: config service cannot list wiki files.'],
+    };
+  }
+  const listed = await listFiles('knowledge', true);
+  const repairs: WikiSlRefRepair[] = [];
+
+  for (const file of listed.files.sort()) {
+    const parsedPath = parseKnowledgeFilePath(file);
+    if (!parsedPath) {
+      continue;
+    }
+    const page = await input.wikiService.readPage(parsedPath.scope, parsedPath.scopeId, parsedPath.pageKey);
+    const refs = uniqueStringArray(page?.frontmatter.sl_refs);
+    if (!page || refs.length === 0) {
+      continue;
+    }
+    const keptRefs = refs.filter((ref) => validRefs.has(ref));
+    const removedRefs = refs.filter((ref) => !validRefs.has(ref));
+    if (removedRefs.length === 0) {
+      continue;
+    }
+
+    const frontmatter: WikiFrontmatter = {
+      ...page.frontmatter,
+      sl_refs: keptRefs,
+    };
+    await input.wikiService.writePage(
+      parsedPath.scope,
+      parsedPath.scopeId,
+      parsedPath.pageKey,
+      frontmatter,
+      page.content,
+      SYSTEM_AUTHOR,
+      SYSTEM_EMAIL,
+      `Repair semantic-layer refs: ${parsedPath.pageKey}`,
+    );
+    repairs.push({ ...parsedPath, removedRefs });
+  }
+
+  return {
+    repairs,
+    warnings: [
+      ...warnings,
+      ...repairs.map(
+        (repair) =>
+          `Removed invalid sl_refs from ${repair.pageKey}: ${repair.removedRefs.join(', ')}`,
+      ),
+    ],
+  };
+}

packages/context/src/memory/local-memory.ts

@@ -36,6 +36,7 @@ import { BaseTool, type GitAuthorResolverPort, type ToolContext } from '../tools
 import {
   type KnowledgeEventPort,
   type KnowledgeIndexPort,
+  type KnowledgeIndexPageListing,
   KnowledgeWikiService,
   searchLocalKnowledgePages,
   WikiListTagsTool,
@@ -219,7 +220,7 @@ class LocalKnowledgeIndex implements KnowledgeIndexPort {
   }
 
   async listPagesForUser(userId: string) {
-    const pages: Array<{ id?: string; page_key: string; summary: string; scope: string; scope_id: string | null }> = [];
+    const pages: KnowledgeIndexPageListing[] = [];
     for (const scope of [
       { scope: 'GLOBAL', scopeId: null, dir: 'knowledge/global' },
       { scope: 'USER', scopeId: userId, dir: `knowledge/user/${userId}` },
@@ -234,6 +235,7 @@ class LocalKnowledgeIndex implements KnowledgeIndexPort {
           summary: parsed.summary,
           scope: scope.scope,
           scope_id: scope.scopeId,
+          tags: parseWikiTags(raw.content),
         });
       }
     }
@@ -433,7 +435,7 @@ class LocalMemoryToolsetFactory implements MemoryToolsetFactoryPort {
           };
         },
       }),
-      new WikiListTagsTool(deps.wikiService, deps.knowledgeIndex),
+      new WikiListTagsTool(deps.knowledgeIndex),
       new WikiWriteTool(deps.wikiService, deps.knowledgeIndex, deps.knowledgeEvents),
       new WikiRemoveTool(deps.wikiService, deps.knowledgeIndex, deps.knowledgeEvents),
     ];
@@ -468,6 +470,17 @@ function parseWiki(raw: string): { summary: string; content: string } {
   };
 }
 
+function parseWikiTags(raw: string): string[] {
+  const match = raw.match(/^---\n([\s\S]*?)\n---\n?/);
+  if (!match) {
+    return [];
+  }
+  const frontmatter = (YAML.parse(match[1]) ?? {}) as Record<string, unknown>;
+  return Array.isArray(frontmatter.tags)
+    ? frontmatter.tags.filter((tag): tag is string => typeof tag === 'string')
+    : [];
+}
+
 function scoreText(text: string, query: string): number {
   const normalized = query.toLowerCase().trim();
   if (!normalized) {

packages/context/src/memory/memory-runtime-assets.test.ts

@@ -23,11 +23,42 @@ const expectedAdapterSkillHeadings: Record<string, string> = {
   metabase_ingest: '# Metabase to KTX Semantic Layer',
   metricflow_ingest: '# MetricFlow to KTX Semantic Layer',
 };
+const verificationWriterSkills = [
+  'notion_synthesize',
+  'dbt_ingest',
+  'lookml_ingest',
+  'looker_ingest',
+  'metabase_ingest',
+  'metricflow_ingest',
+  'live_database_ingest',
+  'historic_sql_table_digest',
+  'historic_sql_patterns',
+  'knowledge_capture',
+  'sl_capture',
+] as const;
 
 function forbiddenProductPattern() {
   return new RegExp([['Kae', 'lio'].join(''), ['kae', 'lio'].join(''), ['KAE', 'LIO_'].join('')].join('|'));
 }
 
+function sqlExecutionCallBlocks(body: string): string[] {
+  const blocks: string[] = [];
+  const marker = 'sql_execution({';
+  let offset = 0;
+
+  while (offset < body.length) {
+    const start = body.indexOf(marker, offset);
+    if (start === -1) {
+      break;
+    }
+    const end = body.indexOf('})', start + marker.length);
+    blocks.push(body.slice(start, end === -1 ? start + marker.length : end + 2));
+    offset = start + marker.length;
+  }
+
+  return blocks;
+}
+
 describe('memory runtime assets', () => {
   it('packages every memory-agent base prompt referenced by promptNameFor()', async () => {
     const prompts = new PromptService({ promptsDir, partials: [] });
@@ -117,4 +148,50 @@ describe('memory runtime assets', () => {
     expect(body).toContain('Do not call `sl_write_source` or `sl_edit_source`');
     expect(body).toContain('LookML writes target the run connection directly');
   });
+
+  it('ships identifier verification protocol in every synthesis writer skill', async () => {
+    for (const skillName of verificationWriterSkills) {
+      const body = await readFile(join(skillsDir, skillName, 'SKILL.md'), 'utf-8');
+      expect(body).toContain('## Identifier Verification Protocol');
+      expect(body).toMatch(/discover_data|entity_details/);
+    }
+  });
+
+  it('does not ship stale warehouse verification tool names or fictional identifiers', async () => {
+    for (const skillName of verificationWriterSkills) {
+      const body = await readFile(join(skillsDir, skillName, 'SKILL.md'), 'utf-8');
+      expect(body).not.toContain('orbit_analytics.customer');
+      expect(body).not.toContain('wiki_sl_search');
+      expect(body).not.toContain('sl_describe_table');
+    }
+  });
+
+  it('ships only the KTX connectionName sql_execution call shape in writer guidance', async () => {
+    const shared = await readFile(join(skillsDir, '_shared', 'identifier-verification.md'), 'utf-8');
+    const bodies = [{ name: '_shared/identifier-verification.md', body: shared }];
+
+    expect(shared).toContain('sql_execution({connectionName, sql: "SELECT DISTINCT');
+    expect(shared).toContain('sql_execution({connectionName, sql: "SELECT 1 FROM');
+
+    for (const skillName of verificationWriterSkills) {
+      const body = await readFile(join(skillsDir, skillName, 'SKILL.md'), 'utf-8');
+      bodies.push({ name: `${skillName}/SKILL.md`, body });
+      expect(body).toContain('sql_execution({connectionName');
+      expect(body).not.toContain('sql_execution({ sql');
+      expect(body).not.toContain('session shape');
+      expect(body).not.toContain('connection is already pinned by the ingest session');
+    }
+
+    for (const { name, body } of bodies) {
+      const calls = sqlExecutionCallBlocks(body);
+      expect(calls.length, `${name} should contain sql_execution guidance`).toBeGreaterThan(0);
+      expect(
+        calls.filter((call) => !call.includes('connectionName')),
+        `${name} has sql_execution calls without connectionName`,
+      ).toEqual([]);
+      expect(body, `${name} has a connectionless multiline sql_execution call`).not.toMatch(
+        /sql_execution\(\{\s*sql\s*:/,
+      );
+    }
+  });
 });

packages/context/src/sl/tools/sl-warehouse-validation.ts

@@ -90,7 +90,7 @@ export async function validateSingleSource(
           `writing it as-is drops the manifest's columns and joins. ` +
           `Remove "sql:", "table:", "grain:", "columns:", and "joins:" and keep only ` +
           `"name:" plus "measures:"/"segments:"/"description:" to write an overlay ` +
-          `that inherits the manifest schema. Call sl_describe_table to see it first.`,
+          `that inherits the manifest schema. Call sl_read_source to inspect the existing source first.`,
       );
       return { errors, warnings };
     }

packages/context/src/tools/tool-session.ts

@@ -47,6 +47,7 @@ export interface ToolSession {
   touchedSlSources: TouchedSlSourceSet;
   actions: MemoryAction[];
   allowedRawPaths?: ReadonlySet<string>;
+  allowedConnectionNames?: ReadonlySet<string>;
   semanticLayerService: SemanticLayerService;
   wikiService: KnowledgeWikiService;
   configService: KtxFileStorePort;

packages/context/src/wiki/index.ts

@@ -12,6 +12,7 @@ export type {
   KnowledgeEventPort,
   KnowledgeGitDiffPort,
   KnowledgeIndexPort,
+  KnowledgeIndexPageListing,
   UpsertPageParams,
   WikiFileStorePort,
 } from './ports.js';

packages/context/src/wiki/knowledge-wiki.service.test.ts

@@ -113,13 +113,13 @@ describe('KnowledgeWikiService.syncFromCommit', () => {
     expect(call.deletes).toEqual([{ scope: 'GLOBAL', scopeId: null, pageKey: 'gone-page' }]);
   });
 
-  it('indexes historic-SQL nested pages but skips other nested wiki paths from commit sync', async () => {
+  it('indexes only flat wiki pages and skips nested paths from commit sync', async () => {
     const { service, pagesRepository, gitService, logger } = makeService();
 
     gitService.diffNameStatus.mockResolvedValue([
       { status: 'A', path: 'knowledge/global/revenue-policy.md' },
+      { status: 'A', path: 'knowledge/global/historic-sql-order-lifecycle.md' },
       { status: 'A', path: 'knowledge/global/historic-sql/order-lifecycle.md' },
-      { status: 'A', path: 'knowledge/global/historic-sql/_archived/retired-pattern.md' },
       { status: 'A', path: 'knowledge/global/orbit/company-overview.md' },
     ]);
     gitService.getFileAtCommit.mockImplementation((path: string) => {
@@ -138,26 +138,25 @@ describe('KnowledgeWikiService.syncFromCommit', () => {
     await service.syncFromCommit('sha-before', 'sha-after', 'run-uuid');
 
     expect(gitService.getFileAtCommit).not.toHaveBeenCalledWith('knowledge/global/orbit/company-overview.md', 'sha-after');
+    expect(gitService.getFileAtCommit).not.toHaveBeenCalledWith('knowledge/global/historic-sql/order-lifecycle.md', 'sha-after');
     expect(logger.warn).toHaveBeenCalledWith(
       '[knowledge.sync] skipping unparseable path: knowledge/global/orbit/company-overview.md',
     );
+    expect(logger.warn).toHaveBeenCalledWith(
+      '[knowledge.sync] skipping unparseable path: knowledge/global/historic-sql/order-lifecycle.md',
+    );
     const call = pagesRepository.applyDiffTransactional.mock.calls[0][0];
     expect(call.upserts).toEqual(
       expect.arrayContaining([
         expect.objectContaining({ scope: 'GLOBAL', pageKey: 'revenue-policy', summary: 'revenue' }),
         expect.objectContaining({
           scope: 'GLOBAL',
-          pageKey: 'historic-sql/order-lifecycle',
+          pageKey: 'historic-sql-order-lifecycle',
           summary: 'order lifecycle',
         }),
-        expect.objectContaining({
-          scope: 'GLOBAL',
-          pageKey: 'historic-sql/_archived/retired-pattern',
-          summary: 'retired',
-        }),
       ]),
     );
-    expect(call.upserts).toHaveLength(3);
+    expect(call.upserts).toHaveLength(2);
   });
 
   it('is a no-op when the diff between shas has no knowledge changes', async () => {

packages/context/src/wiki/knowledge-wiki.service.ts

@@ -11,10 +11,6 @@ const WIKI_PREFIX = 'knowledge';
 
 export type { WikiFrontmatter };
 
-function isHistoricSqlPathSegment(segment: string): boolean {
-  return /^[a-zA-Z0-9_][a-zA-Z0-9_-]*$/.test(segment);
-}
-
 export class KnowledgeWikiService {
   private isWorktreeScoped = false;
 
@@ -422,7 +418,6 @@ export class KnowledgeWikiService {
  * Parse a `knowledge/<scope>/...` file path into its scope and page key.
  *   `knowledge/global/foo.md` → { scope: 'GLOBAL', scopeId: null, pageKey: 'foo' }
  *   `knowledge/user/<id>/bar.md` → { scope: 'USER', scopeId: '<id>', pageKey: 'bar' }
- *   `knowledge/global/historic-sql/foo.md` → { scope: 'GLOBAL', scopeId: null, pageKey: 'historic-sql/foo' }
  */
 function parseKnowledgePath(path: string): { scope: string; scopeId: string | null; pageKey: string } | null {
   if (!path.endsWith('.md')) {
@@ -437,13 +432,6 @@ function parseKnowledgePath(path: string): { scope: string; scopeId: string | nu
     const pageKey = rest[1].replace(/\.md$/, '');
     return isFlatWikiKey(pageKey) ? { scope: 'GLOBAL', scopeId: null, pageKey } : null;
   }
-  if (rest.length >= 3 && rest[0] === 'global' && rest[1] === 'historic-sql') {
-    const historicPath = rest.slice(2).join('/').replace(/\.md$/, '');
-    if (historicPath.split('/').every(isHistoricSqlPathSegment)) {
-      return { scope: 'GLOBAL', scopeId: null, pageKey: `historic-sql/${historicPath}` };
-    }
-    return null;
-  }
   if (rest.length === 3 && rest[0] === 'user') {
     const pageKey = rest[2].replace(/\.md$/, '');
     return isFlatWikiKey(pageKey) ? { scope: 'USER', scopeId: rest[1], pageKey } : null;

packages/context/src/wiki/local-knowledge.test.ts

@@ -244,4 +244,30 @@ describe('local knowledge helpers', () => {
       }),
     ).rejects.toThrow('Invalid wiki key "orbit/company-overview". Wiki keys must be flat; use "orbit-company-overview".');
   });
+
+  it('ignores nested historic-SQL legacy paths when listing local knowledge pages', async () => {
+    await writeLocalKnowledgePage(project, {
+      key: 'historic-sql-paid-orders',
+      scope: 'GLOBAL',
+      summary: 'Flat historic SQL page',
+      content: 'Flat page body.',
+      tags: ['historic-sql'],
+    });
+    await project.fileStore.writeFile(
+      'knowledge/global/historic-sql/paid-orders.md',
+      '---\nsummary: Nested historic SQL page\nusage_mode: auto\n---\n\nNested body\n',
+      'Test',
+      'test@example.com',
+      'Write nested legacy page',
+    );
+
+    await expect(listLocalKnowledgePages(project, { userId: 'local' })).resolves.toEqual([
+      {
+        key: 'historic-sql-paid-orders',
+        path: 'knowledge/global/historic-sql-paid-orders.md',
+        scope: 'GLOBAL',
+        summary: 'Flat historic SQL page',
+      },
+    ]);
+  });
 });

packages/context/src/wiki/local-knowledge.ts

@@ -80,26 +80,12 @@ function knowledgePath(scope: LocalKnowledgeScope, userId: string | undefined, k
   return `knowledge/user/${assertSafePathToken('user id', userId ?? 'local')}/${safeKey}.md`;
 }
 
-function isHistoricSqlPathSegment(segment: string): boolean {
-  return /^[a-zA-Z0-9_][a-zA-Z0-9_-]*$/.test(segment);
-}
-
 function keyFromKnowledgePath(path: string, scope: LocalKnowledgeScope, userId: string): string | null {
   const prefix = scope === 'GLOBAL' ? 'knowledge/global/' : `knowledge/user/${assertSafePathToken('user id', userId)}/`;
   const key = path.slice(prefix.length).replace(/\.md$/, '');
   if (isFlatWikiKey(key)) {
     return key;
   }
-  if (
-    scope === 'GLOBAL' &&
-    key.startsWith('historic-sql/') &&
-    key
-      .slice('historic-sql/'.length)
-      .split('/')
-      .every(isHistoricSqlPathSegment)
-  ) {
-    return key;
-  }
   return null;
 }
 

packages/context/src/wiki/ports.ts

@@ -13,6 +13,15 @@ export interface UpsertPageParams {
   sourceRunId?: string | null;
 }
 
+export interface KnowledgeIndexPageListing {
+  id?: string;
+  page_key: string;
+  summary: string;
+  scope: string;
+  scope_id: string | null;
+  tags: string[];
+}
+
 export interface KnowledgeIndexPort {
   upsertPage(params: UpsertPageParams): Promise<void>;
   applyDiffTransactional(params: {
@@ -32,9 +41,7 @@ export interface KnowledgeIndexPort {
     scopeId: string | null,
     pageKey: string,
   ): Promise<{ id?: string; page_key: string } | null | undefined>;
-  listPagesForUser(
-    userId: string,
-  ): Promise<Array<{ id?: string; page_key: string; summary: string; scope: string; scope_id: string | null }>>;
+  listPagesForUser(userId: string): Promise<KnowledgeIndexPageListing[]>;
   getUserPageCount(userId: string): Promise<number>;
   incrementUsageCount(pageIds: string[]): Promise<void>;
   searchRRF(

packages/context/src/wiki/tools/wiki-list-tags.tool.test.ts

@@ -8,22 +8,11 @@ describe('WikiListTagsTool', () => {
   it("returns distinct sorted tags across the user's visible pages", async () => {
     const pagesRepository = {
       listPagesForUser: vi.fn().mockResolvedValue([
-        { scope: 'GLOBAL', scope_id: null, page_key: 'k1' },
-        { scope: 'USER', scope_id: 'u', page_key: 'k2' },
+        { scope: 'GLOBAL', scope_id: null, page_key: 'k1', tags: ['metrics', 'finance'] },
+        { scope: 'USER', scope_id: 'u', page_key: 'k2', tags: ['metrics'] },
       ]),
     };
-    const wikiService = {
-      readPage: vi.fn().mockImplementation((_scope, _scopeId, key) => {
-        if (key === 'k1') {
-          return Promise.resolve({ frontmatter: { tags: ['metrics', 'finance'] }, content: '' });
-        }
-        if (key === 'k2') {
-          return Promise.resolve({ frontmatter: { tags: ['metrics'] }, content: '' });
-        }
-        return Promise.resolve(null);
-      }),
-    };
-    const tool = new WikiListTagsTool(wikiService as any, pagesRepository as any);
+    const tool = new WikiListTagsTool(pagesRepository as any);
 
     const result = await tool.call({}, baseContext);
     expect(result.markdown).toContain('finance');
@@ -31,10 +20,23 @@ describe('WikiListTagsTool', () => {
     expect(result.structured.tags).toEqual(['finance', 'metrics']);
   });
 
+  it('lists tags from historic-SQL indexed pages with flat wiki keys', async () => {
+    const pagesRepository = {
+      listPagesForUser: vi.fn().mockResolvedValue([
+        { scope: 'GLOBAL', scope_id: null, page_key: 'company-overview', tags: ['notion'] },
+        { scope: 'GLOBAL', scope_id: null, page_key: 'historic-sql-revenue-pattern', tags: ['historic-sql', 'pattern'] },
+      ]),
+    };
+    const tool = new WikiListTagsTool(pagesRepository as any);
+
+    const result = await tool.call({}, baseContext);
+
+    expect(result.structured.tags).toEqual(['historic-sql', 'notion', 'pattern']);
+  });
+
   it('returns a friendly message when no pages have tags', async () => {
     const pagesRepository = { listPagesForUser: vi.fn().mockResolvedValue([]) };
-    const wikiService = { readPage: vi.fn() };
-    const tool = new WikiListTagsTool(wikiService as any, pagesRepository as any);
+    const tool = new WikiListTagsTool(pagesRepository as any);
 
     const result = await tool.call({}, baseContext);
     expect(result.markdown).toMatch(/no tags/i);

packages/context/src/wiki/tools/wiki-list-tags.tool.ts

@@ -1,7 +1,5 @@
 import { z } from 'zod';
 import type { KnowledgeIndexPort } from '../ports.js';
-type BlockScope = 'GLOBAL' | 'USER';
-import { KnowledgeWikiService } from '../index.js';
 import { BaseTool, type ToolContext, type ToolOutput } from '../../tools/index.js';
 
 const wikiListTagsInputSchema = z.object({});
@@ -11,10 +9,7 @@ type WikiListTagsInput = z.infer<typeof wikiListTagsInputSchema>;
 export class WikiListTagsTool extends BaseTool<typeof wikiListTagsInputSchema> {
   readonly name = 'wiki_list_tags';
 
-  constructor(
-    private readonly wikiService: KnowledgeWikiService,
-    private readonly pagesRepository: KnowledgeIndexPort,
-  ) {
+  constructor(private readonly pagesRepository: KnowledgeIndexPort) {
     super();
   }
 
@@ -33,10 +28,7 @@ Call before writing a new page so you can reuse existing tags consistently inste
     const pages = await this.pagesRepository.listPagesForUser(context.userId);
     const set = new Set<string>();
     for (const p of pages) {
-      const scope = p.scope as BlockScope;
-      const scopeId = scope === 'USER' ? p.scope_id : null;
-      const page = await this.wikiService.readPage(scope, scopeId, p.page_key);
-      for (const t of page?.frontmatter.tags ?? []) {
+      for (const t of p.tags) {
         set.add(t);
       }
     }

packages/context/src/wiki/tools/wiki-write.tool.ts

@@ -150,6 +150,7 @@ export class WikiWriteTool extends BaseTool<typeof wikiWriteInputSchema> {
 Create or update a knowledge page. Provide content for create/rewrite, or replacements for targeted edits.
 For existing pages, you may provide only frontmatter fields such as summary, tags, refs, or sl_refs to update metadata while preserving content.
 tags/refs/sl_refs use REPLACE semantics: omit to keep existing on update, [] to clear, [values] to set.
+Keys must be flat file names, not directory paths. Use tags/source frontmatter for grouping.
 </purpose>`;
   }
 

packages/context/src/wiki/types.ts

@@ -25,6 +25,7 @@ export interface WikiFrontmatter {
   usage?: HistoricSqlWikiUsageFrontmatter;
   fingerprints?: string[];
   stale_since?: string;
+  archived_since?: string;
 }
 
 export interface WikiPage {

python/ktx-sl/semantic_layer/generator.py

@@ -687,6 +687,12 @@ class SqlGenerator:
                 if isinstance(node, exp.AggFunc):
                     if isinstance(node, exp.Count):
                         count_arg = node.this
+                        if isinstance(count_arg, exp.Star):
+                            node.set(
+                                "this",
+                                _make_case(exp.Literal.number(1)),
+                            )
+                            return node
                         if (
                             isinstance(count_arg, exp.Distinct)
                             and count_arg.expressions

python/ktx-sl/tests/test_corner_case_regressions.py

@@ -243,6 +243,37 @@ def test_filtered_count_distinct_keeps_distinct_inside_count():
     assert_valid_sql(result.sql)
 
 
+def test_filtered_count_star_uses_case_one_not_case_star():
+    engine = make_engine(
+        {
+            "accounts": {
+                "name": "accounts",
+                "table": "public.accounts",
+                "grain": ["id"],
+                "columns": [
+                    {"name": "id", "type": "number"},
+                    {"name": "risk_level", "type": "string"},
+                ],
+                "measures": [
+                    {
+                        "name": "high_risk_account_count",
+                        "expr": "count(*)",
+                        "filter": "risk_level = 'high'",
+                    }
+                ],
+            }
+        }
+    )
+
+    result = engine.query(
+        {"measures": ["accounts.high_risk_account_count"], "dimensions": []}
+    )
+
+    assert "THEN *" not in result.sql
+    assert "COUNT(CASE WHEN accounts.risk_level = 'high' THEN 1 END)" in result.sql
+    assert_valid_sql(result.sql)
+
+
 def test_predefined_measure_via_alias_uses_real_table_and_alias_qualification():
     engine = make_engine(_alias_measure_sources())
     result = engine.query(