@kaelio/ktx 0.5.0 → 0.7.0

package/dist/status-project.js

@@ -3,13 +3,11 @@ import { basename, join } from 'node:path';
 import { runClaudeCodeAuthProbe } from './context/llm/claude-code-runtime.js';
 import { ktxLocalStateDbPath } from './context/project/local-state-db.js';
 import { isQueryHistoryEnabled, queryHistoryDialectForConnection, } from './context/ingest/adapters/historic-sql/connection-dialect.js';
+import { historicSqlProbeCatalogName, runHistoricSqlReadinessProbe, } from './context/ingest/historic-sql-probes.js';
 import { formatClaudeCodePromptCachingFix, formatClaudeCodePromptCachingWarning, ignoredClaudeCodePromptCachingFields, } from './claude-code-prompt-caching.js';
 import { bold as _bold, dim as _dim, green, red, yellow, } from './io/symbols.js';
 import { KTX_NEXT_STEP_DIRECT_COMMANDS } from './next-steps.js';
 const PROJECT_READY_COMMANDS = KTX_NEXT_STEP_DIRECT_COMMANDS.map((step) => step.command);
-function hasOwnField(value, key) {
-    return Object.prototype.hasOwnProperty.call(value, key);
-}
 function resolveRef(value, env) {
     if (typeof value !== 'string')
         return { resolved: '', via: 'missing' };
@@ -26,6 +24,12 @@ function resolveRef(value, env) {
     }
     return { resolved: trimmed, via: 'literal' };
 }
+function failureDetail(error) {
+    if (error instanceof Error && error.message.trim().length > 0) {
+        return error.message.trim().split('\n')[0] ?? error.message.trim();
+    }
+    return String(error);
+}
 function envHint(value) {
     if (typeof value === 'string' && value.trim().startsWith('env:')) {
         return value.trim().slice(4).trim();
@@ -165,7 +169,6 @@ function buildConnectionStatus(name, conn, env) {
     const warn = (detail, fix) => ({ name, driver, status: 'warn', detail, fix });
     switch (driver) {
         case 'postgres':
-        case 'postgresql':
         case 'mysql':
         case 'clickhouse':
         case 'sqlserver': {
@@ -237,180 +240,11 @@ function buildConnectionStatus(name, conn, env) {
             return { name, driver, status: 'ok', detail: 'configured' };
     }
 }
-function failureDetail(error) {
-    if (error instanceof Error && error.message.trim().length > 0) {
-        return error.message.trim().split('\n')[0] ?? error.message.trim();
-    }
-    return String(error);
-}
-function postgresReadinessDetail(result) {
-    const warningText = result.warnings.length > 0 ? ` with warnings: ${result.warnings.join('; ')}` : '';
-    const info = result.info ?? [];
-    const infoText = info.length > 0 ? `; info: ${info.join('; ')}` : '';
-    return `pg_stat_statements ready (${result.pgServerVersion})${warningText}${infoText}`;
-}
-function genericReadinessDetail(label, result) {
-    const warningText = result.warnings.length > 0 ? ` with warnings: ${result.warnings.join('; ')}` : '';
-    const info = result.info ?? [];
-    const infoText = info.length > 0 ? `; info: ${info.join('; ')}` : '';
-    return `${label} ready${warningText}${infoText}`;
-}
-function probeFailureFix(error, dialect, connectionId, projectDir) {
-    if (error instanceof Error && error.name === 'HistoricSqlExtensionMissingError' && 'remediation' in error) {
-        return String(error.remediation);
-    }
-    if (error instanceof Error && error.name === 'HistoricSqlGrantsMissingError' && 'remediation' in error) {
-        return String(error.remediation);
-    }
-    if (error instanceof Error && error.name === 'HistoricSqlVersionUnsupportedError') {
-        return 'Use PostgreSQL 14 or newer, or disable query history for this connection';
-    }
-    return `Fix connections.${connectionId} ${dialect} settings, then rerun \`ktx status --project-dir ${projectDir}\``;
-}
-async function defaultPostgresQueryHistoryProbe(input) {
-    const [{ PostgresPgssReader }, { KtxPostgresHistoricSqlQueryClient }, { isKtxPostgresConnectionConfig }] = await Promise.all([
-        import('./context/ingest/adapters/historic-sql/postgres-pgss-reader.js'),
-        import('./connectors/postgres/historic-sql-query-client.js'),
-        import('./connectors/postgres/connector.js'),
-    ]);
-    const inputDriver = input.connection.driver ?? 'unknown';
-    if (!isKtxPostgresConnectionConfig(input.connection)) {
-        throw new Error(`Native PostgreSQL connector cannot run driver "${inputDriver}"`);
-    }
-    const client = new KtxPostgresHistoricSqlQueryClient({
-        connectionId: input.connectionId,
-        connection: input.connection,
-        env: input.env,
-    });
-    try {
-        return await new PostgresPgssReader().probe(client);
-    }
-    finally {
-        await client.cleanup();
-    }
-}
-async function defaultSnowflakeQueryHistoryProbe(input) {
-    const [{ SnowflakeHistoricSqlQueryHistoryReader }, { KtxSnowflakeHistoricSqlQueryClient }, { isKtxSnowflakeConnectionConfig }] = await Promise.all([
-        import('./context/ingest/adapters/historic-sql/snowflake-query-history-reader.js'),
-        import('./connectors/snowflake/historic-sql-query-client.js'),
-        import('./connectors/snowflake/connector.js'),
-    ]);
-    const inputDriver = input.connection.driver ?? 'unknown';
-    if (!isKtxSnowflakeConnectionConfig(input.connection)) {
-        throw new Error(`Native Snowflake connector cannot run driver "${inputDriver}"`);
-    }
-    const client = new KtxSnowflakeHistoricSqlQueryClient({
-        connectionId: input.connectionId,
-        connection: input.connection,
-        projectDir: input.projectDir,
-        env: input.env,
-    });
-    try {
-        return await new SnowflakeHistoricSqlQueryHistoryReader().probe(client);
-    }
-    finally {
-        await client.cleanup();
-    }
-}
-async function defaultBigQueryQueryHistoryProbe(input) {
-    const [{ BigQueryHistoricSqlQueryHistoryReader }, { KtxBigQueryScanConnector, isKtxBigQueryConnectionConfig }, { resolveKtxConfigReference },] = await Promise.all([
-        import('./context/ingest/adapters/historic-sql/bigquery-query-history-reader.js'),
-        import('./connectors/bigquery/connector.js'),
-        import('./context/core/config-reference.js'),
-    ]);
-    const inputDriver = input.connection.driver ?? 'unknown';
-    if (!isKtxBigQueryConnectionConfig(input.connection)) {
-        throw new Error(`Native BigQuery connector cannot run driver "${inputDriver}"`);
-    }
-    const rawCredentials = typeof input.connection.credentials_json === 'string' ? input.connection.credentials_json : '';
-    const resolvedCredentials = resolveKtxConfigReference(rawCredentials, input.env);
-    if (!resolvedCredentials) {
-        throw new Error(`Query history BigQuery connection ${input.connectionId} requires credentials_json`);
-    }
-    const parsed = JSON.parse(resolvedCredentials);
-    if (typeof parsed.project_id !== 'string' || parsed.project_id.trim().length === 0) {
-        throw new Error(`Query history BigQuery connection ${input.connectionId} requires credentials_json.project_id`);
-    }
-    const region = typeof input.connection.location === 'string' && input.connection.location.trim().length > 0
-        ? input.connection.location.trim()
-        : 'us';
-    const connector = new KtxBigQueryScanConnector({
-        connectionId: input.connectionId,
-        connection: input.connection,
-    });
-    try {
-        return await new BigQueryHistoricSqlQueryHistoryReader({
-            projectId: parsed.project_id,
-            region,
-        }).probe({
-            async executeQuery(sql) {
-                const result = await connector.executeReadOnly({ connectionId: input.connectionId, sql }, {});
-                return {
-                    headers: result.headers,
-                    rows: result.rows,
-                    totalRows: result.totalRows,
-                };
-            },
-        });
-    }
-    finally {
-        await connector.cleanup();
-    }
-}
-function postgresProbeDispatch(input, probe) {
-    return {
-        label: 'postgres',
-        spinnerLabel: `Probing pg_stat_statements on ${input.connectionId}`,
-        fastSkipDetail: 'pg_stat_statements probe skipped (--fast)',
-        run: async () => {
-            const result = await probe(input);
-            return {
-                status: result.warnings.length > 0 ? 'warn' : 'ok',
-                detail: postgresReadinessDetail(result),
-                ...(result.warnings.length > 0
-                    ? {
-                        fix: `Update the Postgres parameter group or config, then rerun \`ktx status --project-dir ${input.projectDir}\``,
-                    }
-                    : {}),
-            };
-        },
-    };
-}
-function snowflakeProbeDispatch(input, probe) {
-    return {
-        label: 'snowflake',
-        spinnerLabel: `Probing SNOWFLAKE.ACCOUNT_USAGE.QUERY_HISTORY on ${input.connectionId}`,
-        fastSkipDetail: 'SNOWFLAKE.ACCOUNT_USAGE.QUERY_HISTORY probe skipped (--fast)',
-        run: async () => {
-            const result = await probe(input);
-            return {
-                status: result.warnings.length > 0 ? 'warn' : 'ok',
-                detail: genericReadinessDetail('SNOWFLAKE.ACCOUNT_USAGE.QUERY_HISTORY', result),
-            };
-        },
-    };
-}
-function bigqueryProbeDispatch(input, probe) {
-    return {
-        label: 'bigquery',
-        spinnerLabel: `Probing INFORMATION_SCHEMA.JOBS_BY_PROJECT on ${input.connectionId}`,
-        fastSkipDetail: 'INFORMATION_SCHEMA.JOBS_BY_PROJECT probe skipped (--fast)',
-        run: async () => {
-            const result = await probe(input);
-            return {
-                status: result.warnings.length > 0 ? 'warn' : 'ok',
-                detail: genericReadinessDetail('INFORMATION_SCHEMA.JOBS_BY_PROJECT', result),
-            };
-        },
-    };
-}
 async function buildQueryHistoryStatus(project, options) {
     const targets = Object.entries(project.config.connections)
         .filter(([, connection]) => isQueryHistoryEnabled(connection))
         .sort(([left], [right]) => left.localeCompare(right));
-    const postgresProbe = options.postgresQueryHistoryProbe ?? defaultPostgresQueryHistoryProbe;
-    const snowflakeProbe = options.snowflakeQueryHistoryProbe ?? defaultSnowflakeQueryHistoryProbe;
-    const bigqueryProbe = options.bigqueryQueryHistoryProbe ?? defaultBigQueryQueryHistoryProbe;
+    const probe = options.queryHistoryReadinessProbe ?? runHistoricSqlReadinessProbe;
     const env = options.env ?? process.env;
     const statuses = [];
     for (const [connectionId, connection] of targets) {
@@ -427,51 +261,64 @@ async function buildQueryHistoryStatus(project, options) {
             });
             continue;
         }
-        const probeInput = {
-            projectDir: project.projectDir,
-            connectionId,
-            connection,
-            env,
-        };
-        const dispatched = dialect === 'postgres'
-            ? postgresProbeDispatch(probeInput, postgresProbe)
-            : dialect === 'snowflake'
-                ? snowflakeProbeDispatch(probeInput, snowflakeProbe)
-                : bigqueryProbeDispatch(probeInput, bigqueryProbe);
+        const catalogName = historicSqlProbeCatalogName(dialect);
         if (options.fast === true) {
             statuses.push({
                 connection: connectionId,
                 driver,
                 dialect,
                 status: 'skipped',
-                detail: dispatched.fastSkipDetail,
+                detail: `${catalogName} probe skipped (--fast)`,
             });
             continue;
         }
-        try {
-            const outcome = await withSpinner(options.useSpinner === true, dispatched.spinnerLabel, dispatched.run);
+        const outcome = await withSpinner(options.useSpinner === true, `Probing ${catalogName} on ${connectionId}`, () => probe({
+            projectDir: project.projectDir,
+            connectionId,
+            connection,
+            env,
+        }));
+        if (!outcome) {
             statuses.push({
                 connection: connectionId,
                 driver,
-                dialect,
-                ...outcome,
+                dialect: driver,
+                status: 'fail',
+                detail: `query history is not supported for driver "${driver}"`,
+                fix: `Disable connections.${connectionId}.context.queryHistory, or use a postgres, snowflake, or bigquery connection`,
             });
+            continue;
         }
-        catch (error) {
+        if (outcome.ok) {
+            const { detail, warnings } = outcome.runner.formatSuccessDetail(outcome.result);
             statuses.push({
                 connection: connectionId,
                 driver,
                 dialect,
-                status: 'fail',
-                detail: failureDetail(error),
-                fix: probeFailureFix(error, dispatched.label, connectionId, project.projectDir),
+                status: warnings.length > 0 ? 'warn' : 'ok',
+                detail,
+                ...(dialect === 'postgres' && warnings.length > 0
+                    ? {
+                        fix: `Update the Postgres parameter group or config, then rerun \`ktx status --project-dir ${project.projectDir}\``,
+                    }
+                    : {}),
             });
+            continue;
         }
+        const advice = outcome.runner.fixAdvice(outcome.error);
+        statuses.push({
+            connection: connectionId,
+            driver,
+            dialect,
+            status: 'fail',
+            detail: advice.failHeadline,
+            fix: advice.remediation,
+        });
     }
     return statuses;
 }
 const ADAPTER_DRIVER_REQUIREMENT = {
-    'live-database': ['postgres', 'postgresql', 'mysql', 'snowflake', 'bigquery', 'clickhouse', 'sqlite', 'sqlserver'],
+    'live-database': ['postgres', 'mysql', 'snowflake', 'bigquery', 'clickhouse', 'sqlite', 'sqlserver'],
     dbt: ['dbt', 'dbt-core', 'dbt-cloud'],
     notion: ['notion'],
     metabase: ['metabase'],
@@ -501,27 +348,6 @@ function buildStorageStatus(config) {
 }
 function buildWarnings(config, connections, llm, embeddings) {
     const warnings = [];
-    for (const [connectionId, connection] of Object.entries(config.connections)) {
-        const driver = String(connection.driver ?? '').toLowerCase();
-        if (hasOwnField(connection, 'readonly')) {
-            warnings.push({
-                message: `connections.${connectionId}.readonly is no longer used.`,
-                fix: `Remove connections.${connectionId}.readonly from ktx.yaml.`,
-            });
-        }
-        if ((driver === 'sqlite' || driver === 'sqlite3') && hasOwnField(connection, 'file_path')) {
-            warnings.push({
-                message: `connections.${connectionId}.file_path was removed.`,
-                fix: `Rename connections.${connectionId}.file_path to path.`,
-            });
-        }
-        if (driver === 'notion' && hasOwnField(connection, 'last_successful_cursor')) {
-            warnings.push({
-                message: `connections.${connectionId}.last_successful_cursor is local sync state.`,
-                fix: 'Remove it from ktx.yaml. KTX stores the Notion cursor in .ktx/db.sqlite.',
-            });
-        }
-    }
     for (const adapter of config.ingest.adapters) {
         const requiredDrivers = ADAPTER_DRIVER_REQUIREMENT[adapter];
         if (!requiredDrivers)

package/dist/telemetry/events.d.ts

@@ -330,8 +330,8 @@ export declare const telemetryEventSchemas: {
         isCi: z.ZodBoolean;
         reason: z.ZodEnum<{
             crash: "crash";
-            signal: "signal";
             request: "request";
+            signal: "signal";
         }>;
         uptimeMs: z.ZodNumber;
     }, z.core.$strict>;

package/dist/telemetry/index.js

@@ -28,6 +28,9 @@ export async function showTelemetryNoticeIfNeeded(io, packageInfo) {
 const emittedProjectSnapshots = new Set();
 const MCP_SAMPLE_RATE = 0.1;
 let mcpSampled;
+function telemetryDebugEnabled() {
+    return process.env.KTX_TELEMETRY_DEBUG === '1';
+}
 export function shouldEmitMcpTelemetry() {
     mcpSampled ??= Math.random() < MCP_SAMPLE_RATE;
     return mcpSampled;
@@ -36,22 +39,24 @@ export function mcpTelemetrySampleRate() {
     return MCP_SAMPLE_RATE;
 }
 export async function emitTelemetryEvent(input) {
+    const debug = telemetryDebugEnabled();
     const identity = await loadTelemetryIdentity({
         stdoutIsTTY: input.io.stdout.isTTY === true,
         stderr: input.io.stderr,
         env: process.env,
     });
-    if (!identity.enabled || !identity.installId) {
+    if ((!identity.enabled || !identity.installId) && !debug) {
         return;
     }
     const packageInfo = input.packageInfo ?? getKtxCliPackageInfo();
-    const projectId = input.projectDir ? computeTelemetryProjectId(identity.installId, input.projectDir) : undefined;
+    const installId = identity.installId ?? 'debug';
+    const projectId = input.projectDir ? computeTelemetryProjectId(installId, input.projectDir) : undefined;
     await trackTelemetryEvent({
         event: buildTelemetryEvent(input.name, buildCommonEnvelope({
             cliVersion: packageInfo.version,
             isCi: Boolean(process.env.CI),
         }), input.fields),
-        distinctId: identity.installId,
+        distinctId: installId,
         projectId,
         env: process.env,
         stderr: input.io.stderr,

package/dist/tree-picker-state.d.ts

@@ -22,9 +22,9 @@ export interface PickerState {
     checked: Set<string>;
     cursorId: string;
     search: {
-        editing: boolean;
         query: string;
     };
+    isNavigating: boolean;
     pendingConfirm: PendingConfirmKind | null;
     preLoadWarnings: string[];
     transientHint: {
@@ -34,7 +34,7 @@ export interface PickerState {
     requireConfirmOnSave: boolean;
     skipEmptyAction: SkipEmptyAction;
 }
-export type PickerCommand = 'cursor-up' | 'cursor-down' | 'cursor-left' | 'cursor-right' | 'expand' | 'collapse' | 'expand-all' | 'collapse-all' | 'toggle-check' | 'select-all-visible' | 'toggle-select-all-visible' | 'select-none' | 'clear-transient-hint' | 'search-start' | 'search-cancel' | 'search-submit' | 'search-backspace' | {
+export type PickerCommand = 'cursor-up' | 'cursor-down' | 'cursor-left' | 'cursor-right' | 'expand' | 'collapse' | 'expand-all' | 'collapse-all' | 'toggle-check' | 'select-all-visible' | 'toggle-select-all-visible' | 'select-none' | 'clear-transient-hint' | 'search-clear' | 'search-backspace' | {
     type: 'search-input';
     value: string;
 } | 'save-request' | 'save-confirm' | 'save-cancel' | 'quit';

package/dist/tree-picker-state.js

@@ -338,7 +338,8 @@ export function buildInitialState(args) {
         expanded,
         checked: minimalChecked,
         cursorId: args.tree[0]?.id ?? '',
-        search: { editing: false, query: '' },
+        search: { query: '' },
+        isNavigating: false,
         pendingConfirm: null,
         preLoadWarnings,
         transientHint: null,
@@ -346,6 +347,13 @@ export function buildInitialState(args) {
         skipEmptyAction: args.skipEmptyAction ?? 'quit',
     };
 }
+function refocusVisibleCursor(state) {
+    const ids = visibleNodeIds(state);
+    if (ids.length === 0 || ids.includes(state.cursorId)) {
+        return state;
+    }
+    return cloneState(state, { cursorId: ids[0] });
+}
 export function reducer(state, cmd, now = Date.now()) {
     if (state.pendingConfirm) {
         if (cmd === 'save-confirm') {
@@ -362,13 +370,13 @@ export function reducer(state, cmd, now = Date.now()) {
     }
     switch (cmd) {
         case 'cursor-up':
-            return { next: moveCursor(state, 'up'), effect: null };
+            return { next: cloneState(moveCursor(state, 'up'), { isNavigating: true }), effect: null };
         case 'cursor-down':
-            return { next: moveCursor(state, 'down'), effect: null };
+            return { next: cloneState(moveCursor(state, 'down'), { isNavigating: true }), effect: null };
         case 'cursor-left':
-            return { next: moveCursor(state, 'left'), effect: null };
+            return { next: cloneState(moveCursor(state, 'left'), { isNavigating: true }), effect: null };
         case 'cursor-right':
-            return { next: moveCursor(state, 'right'), effect: null };
+            return { next: cloneState(moveCursor(state, 'right'), { isNavigating: true }), effect: null };
         case 'expand':
             return { next: setExpanded(state, state.cursorId, 'toggle'), effect: null };
         case 'collapse':
@@ -392,15 +400,17 @@ export function reducer(state, cmd, now = Date.now()) {
             return { next: selectNone(state), effect: null };
         case 'clear-transient-hint':
             return { next: clearExpiredTransientHint(state, now), effect: null };
-        case 'search-start':
-            return { next: cloneState(state, { search: { ...state.search, editing: true } }), effect: null };
-        case 'search-cancel':
-            return { next: cloneState(state, { search: { editing: false, query: '' } }), effect: null };
-        case 'search-submit':
-            return { next: cloneState(state, { search: { ...state.search, editing: false } }), effect: null };
+        case 'search-clear':
+            return {
+                next: cloneState(state, { search: { query: '' }, isNavigating: false }),
+                effect: null,
+            };
         case 'search-backspace':
             return {
-                next: cloneState(state, { search: { ...state.search, query: state.search.query.slice(0, -1) } }),
+                next: refocusVisibleCursor(cloneState(state, {
+                    search: { query: state.search.query.slice(0, -1) },
+                    isNavigating: false,
+                })),
                 effect: null,
             };
         case 'save-request':
@@ -417,6 +427,12 @@ export function reducer(state, cmd, now = Date.now()) {
         case 'quit':
             return { next: state, effect: 'quit-without-save' };
         default:
-            return { next: cloneState(state, { search: { ...state.search, query: state.search.query + cmd.value } }), effect: null };
+            return {
+                next: refocusVisibleCursor(cloneState(state, {
+                    search: { query: state.search.query + cmd.value },
+                    isNavigating: false,
+                })),
+                effect: null,
+            };
     }
 }

package/dist/tree-picker-tui.d.ts

@@ -20,6 +20,8 @@ interface InkKey {
     return?: boolean;
     escape?: boolean;
     ctrl?: boolean;
+    tab?: boolean;
+    shift?: boolean;
     backspace?: boolean;
     delete?: boolean;
 }
@@ -75,7 +77,7 @@ export declare function windowItems<T>(items: T[], selected: number, visible: nu
     offset: number;
 };
 /** @internal */
-export declare function treePickerCommandForInkInput(input: string, key: InkKey, search: PickerState['search'], pendingConfirm: PickerState['pendingConfirm']): PickerCommand | null;
+export declare function treePickerCommandForInkInput(input: string, key: InkKey, state: Pick<PickerState, 'search' | 'isNavigating' | 'pendingConfirm'>): PickerCommand | null;
 /** @internal */
 export declare function TreePickerApp(props: TreePickerAppProps): ReactNode;
 export interface RenderTreePickerOptions {

package/dist/tree-picker-tui.js

@@ -17,7 +17,7 @@ const NO_COLOR_THEME = {
     selected: 'white',
     warning: 'white',
 };
-const DEFAULT_TREE_PICKER_HELP_TEXT = 'Right Arrow to expand, Up/Down to move, Space to select or unselect, Slash to filter, Enter to confirm, Escape to go back, or Ctrl+C to exit.';
+const DEFAULT_TREE_PICKER_HELP_TEXT = 'Up/Down to move, Right/Left to expand or collapse, Tab to select, Type to search, Enter to confirm, Escape to clear search or go back, Ctrl+C to exit.';
 const DEFAULT_SKIP_EMPTY_MESSAGE = 'Nothing selected. Skip this step? Press Enter to skip or Escape to go back.';
 function resolveTheme(env = process.env) {
     return env.NO_COLOR || env.TERM === 'dumb' ? NO_COLOR_THEME : COLOR_THEME;
@@ -64,8 +64,8 @@ function truncateText(value, width) {
     return `${value.slice(0, width - 3)}...`;
 }
 /** @internal */
-export function treePickerCommandForInkInput(input, key, search, pendingConfirm) {
-    if (pendingConfirm) {
+export function treePickerCommandForInkInput(input, key, state) {
+    if (state.pendingConfirm) {
         if (input === 'y' || key.return)
             return 'save-confirm';
         if (input === 'n' || key.escape)
@@ -74,23 +74,14 @@ export function treePickerCommandForInkInput(input, key, search, pendingConfirm)
             return 'quit';
         return null;
     }
-    if (search.editing) {
-        if (key.escape)
-            return 'search-cancel';
-        if (key.return)
-            return 'search-submit';
-        if (key.backspace || key.delete)
-            return 'search-backspace';
-        if (key.downArrow)
-            return 'cursor-down';
-        if (key.upArrow)
-            return 'cursor-up';
-        if (input.length === 1 && input >= ' ' && input !== '')
-            return { type: 'search-input', value: input };
-        return null;
-    }
     if (key.ctrl === true && input === 'c')
         return 'quit';
+    if (key.ctrl === true && input === 'a')
+        return 'toggle-select-all-visible';
+    if (key.ctrl === true && input === 'n')
+        return 'select-none';
+    if (key.return)
+        return 'save-request';
     if (key.upArrow)
         return 'cursor-up';
     if (key.downArrow)
@@ -99,18 +90,16 @@ export function treePickerCommandForInkInput(input, key, search, pendingConfirm)
         return 'cursor-left';
     if (key.rightArrow)
         return 'cursor-right';
-    if (key.return)
-        return 'save-request';
-    if (input === ' ')
+    if (key.tab)
         return 'toggle-check';
-    if (input === '/')
-        return 'search-start';
-    if (input === 'a')
-        return 'toggle-select-all-visible';
-    if (input === 'n')
-        return 'select-none';
+    if (input === ' ' && state.isNavigating)
+        return 'toggle-check';
+    if (key.backspace || key.delete)
+        return 'search-backspace';
     if (key.escape)
-        return 'quit';
+        return state.search.query.length > 0 ? 'search-clear' : 'quit';
+    if (input.length === 1 && input >= ' ' && input !== '')
+        return { type: 'search-input', value: input };
     return null;
 }
 function PickerRow(props) {
@@ -140,14 +129,13 @@ export function TreePickerApp(props) {
     const theme = useMemo(() => resolveTheme(props.env), [props.env]);
     const visibleIds = visibleNodeIds(state);
     const selectedIndex = Math.max(0, visibleIds.indexOf(state.cursorId));
-    const reservedRows = state.pendingConfirm === 'save-confirm' ? 10 : 9;
+    const reservedRows = state.pendingConfirm === 'save-confirm' ? 11 : 10;
     const visibleRows = Math.max(5, Math.min(12, (props.terminalRows ?? 24) - reservedRows));
     const rows = windowItems(visibleIds, selectedIndex, visibleRows);
     const hiddenAbove = rows.offset;
     const hiddenBelow = Math.max(0, visibleIds.length - rows.offset - rows.items.length);
     const searchMatchCount = filterTree(state).visibleIds.size;
     const width = resolveTreePickerWidth(props.terminalWidth);
-    const showSearch = state.search.editing || state.search.query.trim().length > 0;
     const helpText = props.chrome.helpText ?? DEFAULT_TREE_PICKER_HELP_TEXT;
     const skipEmptyMessage = props.chrome.skipEmptyMessage ?? DEFAULT_SKIP_EMPTY_MESSAGE;
     stateRef.current = state;
@@ -172,7 +160,7 @@ export function TreePickerApp(props) {
         return () => clearTimeout(timeout);
     }, [state.transientHint?.expiresAt]);
     useInput((input, key) => {
-        const command = treePickerCommandForInkInput(input, key, stateRef.current.search, stateRef.current.pendingConfirm);
+        const command = treePickerCommandForInkInput(input, key, stateRef.current);
         if (!command) {
             return;
         }
@@ -189,7 +177,7 @@ export function TreePickerApp(props) {
             app.exit();
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { color: theme.active, children: "\u25C6" }), _jsxs(Text, { bold: true, children: [" ", props.chrome.title] })] }), _jsxs(Box, { flexDirection: "column", borderStyle: "single", borderTop: false, borderRight: false, borderBottom: false, borderColor: theme.active, paddingLeft: 1, children: [_jsx(Text, { color: theme.muted, children: helpText }), _jsx(Text, { children: " " }), (props.chrome.subtitleLines ?? []).map((line, idx) => (_jsx(Text, { color: theme.muted, children: line }, `subtitle-${idx}`))), (props.chrome.warningLines ?? []).map((line, idx) => (_jsx(Text, { color: theme.warning, children: line }, `chromewarn-${idx}`))), state.preLoadWarnings.map((warning) => (_jsx(Text, { color: theme.warning, children: warning }, warning))), showSearch ? (_jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: "/ " }), _jsxs(Text, { children: [state.search.query, state.search.editing ? '█' : ''] }), _jsxs(Text, { color: theme.muted, children: ["  (", searchMatchCount, " matches)"] })] })) : null, _jsx(Text, { children: " " }), hiddenAbove > 0 ? _jsxs(Text, { color: theme.muted, children: ["\u2191 ", hiddenAbove, " more"] }) : null, rows.items.map((nodeId) => (_jsx(PickerRow, { state: state, nodeId: nodeId, width: width, theme: theme }, nodeId))), hiddenBelow > 0 ? _jsxs(Text, { color: theme.muted, children: ["\u2193 ", hiddenBelow, " more"] }) : null, state.pendingConfirm === 'save-confirm' ? (_jsx(Text, { color: theme.warning, children: props.chrome.confirmSaveMessage
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { color: theme.active, children: "\u25C6" }), _jsxs(Text, { bold: true, children: [" ", props.chrome.title] })] }), _jsxs(Box, { flexDirection: "column", borderStyle: "single", borderTop: false, borderRight: false, borderBottom: false, borderColor: theme.active, paddingLeft: 1, children: [_jsx(Text, { color: theme.muted, children: helpText }), _jsx(Text, { children: " " }), (props.chrome.subtitleLines ?? []).map((line, idx) => (_jsx(Text, { color: theme.muted, children: line }, `subtitle-${idx}`))), (props.chrome.warningLines ?? []).map((line, idx) => (_jsx(Text, { color: theme.warning, children: line }, `chromewarn-${idx}`))), state.preLoadWarnings.map((warning) => (_jsx(Text, { color: theme.warning, children: warning }, warning))), _jsxs(Text, { children: [_jsx(Text, { color: theme.muted, children: "Search: " }), state.isNavigating ? (_jsx(Text, { color: theme.muted, children: state.search.query || '(type to filter)' })) : (_jsxs(Text, { children: [state.search.query, _jsx(Text, { inverse: true, children: " " })] })), _jsxs(Text, { color: theme.muted, children: ["  (", searchMatchCount, " match", searchMatchCount === 1 ? '' : 'es', ")"] })] }), _jsx(Text, { children: " " }), hiddenAbove > 0 ? _jsxs(Text, { color: theme.muted, children: ["\u2191 ", hiddenAbove, " more"] }) : null, rows.items.map((nodeId) => (_jsx(PickerRow, { state: state, nodeId: nodeId, width: width, theme: theme }, nodeId))), hiddenBelow > 0 ? _jsxs(Text, { color: theme.muted, children: ["\u2193 ", hiddenBelow, " more"] }) : null, state.pendingConfirm === 'save-confirm' ? (_jsx(Text, { color: theme.warning, children: props.chrome.confirmSaveMessage
                             ? props.chrome.confirmSaveMessage(state)
                             : 'Confirm save? Press Enter to confirm or Escape to go back.' })) : null, state.pendingConfirm === 'skip-empty' ? _jsx(Text, { color: theme.warning, children: skipEmptyMessage }) : null, state.transientHint ? _jsx(Text, { color: theme.warning, children: state.transientHint.text }) : null] }), _jsx(Text, { color: theme.active, children: "\u2514" })] }));
 }