feat: merge ingest and scan

* docs: add CLI component reuse guidance

* docs: add unified ingest ux design

* Refine unified ingest UX design after adversarial review iteration 1

* Refine unified ingest UX design after adversarial review iteration 2

* Refine unified ingest UX design after adversarial review iteration 3

* feat(cli): route public connection ingest command

* feat(cli): hide standalone scan from public help

* feat(cli): plan public ingest depth and query history

* feat(cli): execute public database ingest facets

* feat(ingest): read connection query history config

* fix(cli): use public ingest wording

* fix(config): stop generating ingest adapter allow lists

* docs: document public ingest command

* test: align ingest surface expectations

* docs: add unified ingest public CLI surface plan

* feat(cli): preflight deep public ingest readiness

* feat(setup): store query history in connection context

* feat(setup): store database context depth

* feat(setup): verify context readiness by database depth

* fix(setup): keep context build foreground only

* fix(config): reject reserved ingest connection ids

* test: close unified ingest v1 expectations

* docs: add unified ingest v1 closure plan

* fix(ingest): bypass adapter allow-list for public source ingest

* fix(ingest): honor query history window intent

* fix(ingest): hide scan internals from public database ingest

* feat(ingest): use foreground view for interactive public ingest

* fix(setup): use schema context and query history wording

* test(cli): verify unified ingest public output

* docs: add unified ingest v1 public output closure plan

* fix(setup): forward query history flags

* fix(setup): prompt for postgres query history

* fix(status): report query history readiness

* fix(ingest): remove legacy public guidance

* fix(ingest): polish foreground retry copy

* docs(examples): use unified query history wording

* chore(ingest): finish public query history cleanup

* docs: add unified ingest v1 query history status cleanup plan

* test(docs): cover unified ingest public docs

* docs: align ingest CLI reference with unified UX

* docs: update context build guides for unified ingest

* docs: update setup and primary source ingest wording

* docs: stop advertising adapter-backed example ingest

* docs: close unified ingest public docs gaps

* docs: add unified ingest v1 docs site closure plan

* fix: render unified ingest foreground warnings

* fix: explain query history schema order

* fix: add public ingest retry guidance

* fix: align setup next steps with unified ingest

* fix: remove scan wording from demo progress

* test: verify unified ingest ux closure

* docs: add unified ingest v1 foreground and retry closure plan

* fix(cli): preserve query-history pull config in public ingest

* fix(cli): omit hidden commands from docs command tree

* test(cli): close unified ingest final public surface checks

* docs: add unified ingest v1 final public surface closure plan

* fix(cli): use public source labels in ingest reports

* fix(cli): suppress low-level public ingest output

* test(cli): verify unified ingest public plain output

* docs: add unified ingest v1 public plain output closure plan

* fix(cli): add public ingest copy sanitizers

* fix(cli): sanitize public ingest progress copy

* fix(cli): rename setup schema scope prompt

* docs(plan): add progress copy closure; test: align setup back-nav fixture

Adds the iter9 plan and updates the setup back-navigation test fixture
to pass disableQueryHistory plus listSchemas/listTables stubs that the
unified ingest setup step now requires.

* docs(plan): add final ux labels plan with narrowed label scans

* fix(cli): aggregate unsupported query-history warnings

* fix(cli): align setup database labels

* test(cli): fix setup database test type-check

* fix(cli): remove primary-source wording from setup output

* test(cli): verify unified ingest setup closure

* docs(plan): add unified ingest v1 verification copy closure plan

* fix(cli): remove top-level scan command

* fix(cli): remove legacy ingest and wiki commands

* Merge scan into ingest flow

* feat(cli): split ingest progress into per-phase rows, rename work units to tasks

Each database target in the unified ingest dashboard now renders one row per
real subprocess (Schema, then Query history when enabled) instead of a single
combined bar. Each phase has its own monotonic 0-100% bar so the progress
never snaps back to zero when historic-sql starts after scan completes.
Completed phases keep their final bar, summary, and elapsed time visible as
an inline audit trail; queued and skipped phases are shown explicitly.

Also rename user-facing "work units" / "Failed work units" to "tasks" /
"Failed tasks" in ingest output and parseIngestSummary. The parser still
accepts the legacy "Work units:" wording in captured output for backward
compat. Internal memory-flow event names and type fields are left alone.

* Fix test harness failures

* Fix CI smoke checks

---------

Co-authored-by: Andrey Avtomonov <7889985+andreybavt@users.noreply.github.com>

packages/cli/src/cli-program.ts

@@ -3,7 +3,6 @@ import type { KtxCliDeps, KtxCliIo, KtxCliPackageInfo } from './cli-runtime.js';
 import { registerConnectionCommands } from './commands/connection-commands.js';
 import { registerIngestCommands } from './commands/ingest-commands.js';
 import { registerWikiCommands } from './commands/knowledge-commands.js';
-import { registerScanCommands } from './commands/scan-commands.js';
 import { registerSetupCommands } from './commands/setup-commands.js';
 import { registerSlCommands } from './commands/sl-commands.js';
 import { registerStatusCommands } from './commands/status-commands.js';
@@ -53,7 +52,24 @@ type CommandPathNode = CommandWithGlobalOptions & {
   parent?: CommandPathNode | null;
 };
 
-const PROJECT_AWARE_ROOT_COMMANDS = new Set(['setup', 'connection', 'ingest', 'wiki', 'sl', 'status', 'scan']);
+const PROJECT_AWARE_ROOT_COMMANDS = new Set(['setup', 'connection', 'ingest', 'wiki', 'sl', 'status']);
+const REMOVED_COMMAND_PATHS = new Set([
+  'scan',
+  'wiki read',
+  'wiki write',
+]);
+const GLOBAL_OPTIONS_WITH_VALUE = new Set(['--project-dir']);
+const OPTIONS_WITH_VALUE = new Set([
+  '--project-dir',
+  '--query-history-window-days',
+  '--user-id',
+  '--limit',
+  '--format',
+  '--connection-id',
+  '--source-name',
+  '--query-file',
+  '--max-rows',
+]);
 
 export interface CommandWithGlobalOptions {
   opts: () => object;
@@ -179,9 +195,6 @@ function shouldSuppressProjectDirLine(path: string[], options: Record<string, un
     return true;
   }
 
-  if (commandPathKey === 'ktx ingest watch') {
-    return options.json !== true && options.plain !== true;
-  }
   const demoIndex = path.indexOf('demo');
   if (demoIndex >= 0) {
     const demoCommand = path[demoIndex + 1];
@@ -226,10 +239,6 @@ function createBaseProgram(info: KtxCliPackageInfo, io: KtxCliIo): Command {
     .version(`${info.name} ${info.version}`, '-v, --version', 'Show CLI version')
     .helpOption('-h, --help', 'Show this help text')
     .configureHelp({ showGlobalOptions: true })
-    .addHelpText(
-      'after',
-      '\nAdvanced:\n  ktx dev        Low-level project initialization and runtime management.\n',
-    )
     .showHelpAfterError()
     .exitOverride()
     .configureOutput({
@@ -259,6 +268,45 @@ function formatCliError(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
+function commandPathFromArgv(argv: string[]): string[] {
+  const path: string[] = [];
+  for (let index = 0; index < argv.length && path.length < 2; index += 1) {
+    const arg = argv[index];
+    if (arg === undefined) {
+      continue;
+    }
+    if (arg === '--') {
+      break;
+    }
+    if ((path.length === 0 ? GLOBAL_OPTIONS_WITH_VALUE : OPTIONS_WITH_VALUE).has(arg)) {
+      index += 1;
+      continue;
+    }
+    const optionsWithValue = path.length === 0 ? GLOBAL_OPTIONS_WITH_VALUE : OPTIONS_WITH_VALUE;
+    if ([...optionsWithValue].some((option) => arg.startsWith(`${option}=`))) {
+      continue;
+    }
+    if (path.length === 0 && arg === '--debug') {
+      continue;
+    }
+    if (arg.startsWith('-')) {
+      continue;
+    }
+    path.push(arg);
+  }
+  return path;
+}
+
+function removedCommandName(argv: string[]): string | null {
+  const path = commandPathFromArgv(argv);
+  if (path.length === 0) {
+    return null;
+  }
+
+  const pathKey = path.join(' ');
+  return REMOVED_COMMAND_PATHS.has(pathKey) ? path.at(-1) ?? null : null;
+}
+
 async function runBareInteractiveCommand(
   program: Command,
   io: KtxCliIo,
@@ -314,14 +362,11 @@ export function buildKtxProgram(options: BuildKtxProgramOptions): Command {
   registerSetupCommands(program, context);
   registerConnectionCommands(program, context);
   registerIngestCommands(program, context, {
-    runIngestWithProgress: async (ingestArgs, ingestIo, ingestDeps, defaultRunIngest) =>
-      await (ingestDeps.ingest ?? defaultRunIngest)(ingestArgs, ingestIo),
     runTextIngest: async (textIngestArgs, ingestIo, ingestDeps) => {
       const { runKtxTextIngest } = await import('./text-ingest.js');
       return await (ingestDeps.textIngest ?? runKtxTextIngest)(textIngestArgs, ingestIo);
     },
   });
-  registerScanCommands(program, context);
   registerWikiCommands(program, context);
   registerSlCommands(program, context);
   registerStatusCommands(program, context);
@@ -375,6 +420,12 @@ export async function runCommanderKtxCli(
     return 0;
   }
 
+  const removedCommand = removedCommandName(argv);
+  if (removedCommand) {
+    io.stderr.write(`error: unknown command '${removedCommand}'\n`);
+    return 1;
+  }
+
   try {
     await profileSpan('commander:parseAsync', () => program.parseAsync(argv, { from: 'user' }));
   } catch (error) {