chkit 0.1.2-beta.7 → 0.2.0-beta.11

package/dist/commands/migrate/output.js

@@ -3,6 +3,11 @@ import { join } from 'node:path';
 import { emitJson } from '../../runtime/json-output.js';
 import { resolveJournalTableName } from '../../runtime/journal-store.js';
 import { extractMigrationMetadata } from '../../runtime/migration-metadata.js';
+import { statusBeforeAbandon } from './abandon.js';
+import { previewStatement } from './apply.js';
+import { EMPTY_MIGRATIONS_SUMMARY } from './errors.js';
+// A regenerated migration plans the statements that completed again.
+const REPEATED_STATEMENTS_HINT = 'The new migration may repeat statements that completed; remove those that cannot run twice, such as a REMOVE DEFAULT or REMOVE MATERIALIZED, before you apply it.';
 export function emitChecksumMismatchJson(input) {
     emitJson('migrate', {
         mode: input.mode,
@@ -20,19 +25,26 @@ export function emitNoScopeMatch(input) {
             pending: [],
             applied: [],
             warning: `No tables matched selector "${selector}".`,
+            ...(input.retry ? { retry: input.retry } : {}),
         });
+        return;
     }
-    else {
-        console.log(`No tables matched selector "${selector}". No migrations selected.`);
-    }
+    console.log(`No tables matched selector "${selector}". No migrations selected.`);
+    renderRetryNotice(input.retry);
 }
 export function emitNoPending(input) {
     if (input.jsonMode) {
-        emitJson('migrate', { mode: input.mode, scope: input.scope, pending: [], applied: [] });
-    }
-    else {
-        console.log('No pending migrations.');
+        emitJson('migrate', {
+            mode: input.mode,
+            scope: input.scope,
+            pending: [],
+            applied: [],
+            ...(input.retry ? { retry: input.retry } : {}),
+        });
+        return;
     }
+    console.log('No pending migrations.');
+    renderRetryNotice(input.retry);
 }
 export function emitPlanJson(input) {
     emitJson('migrate', {
@@ -42,10 +54,13 @@ export function emitPlanJson(input) {
         ...(input.undeterminedScope.length > 0
             ? { undeterminedMigrations: input.undeterminedScope }
             : {}),
+        ...(input.emptyMigrations.length > 0 ? { emptyMigrations: input.emptyMigrations } : {}),
+        ...(input.retry ? { retry: input.retry } : {}),
     });
 }
 export async function renderPlanText(input) {
-    const { migrationsDir, scope, undeterminedScope, pending } = input;
+    const { migrationsDir, scope, undeterminedScope, pending, emptyMigrations, retry } = input;
+    const empty = new Set(emptyMigrations);
     if (scope.enabled) {
         console.log(`Table scope: ${scope.selector ?? ''} (${scope.matchCount} matched)`);
         for (const table of scope.matchedTables)
@@ -59,12 +74,17 @@ export async function renderPlanText(input) {
     }
     console.log(`Pending migrations: ${pending.length}`);
     for (const file of pending) {
-        console.log(`- ${file}`);
+        console.log(empty.has(file) ? `- ${file}  (no executable statements)` : `- ${file}`);
         const sql = await readFile(join(migrationsDir, file), 'utf8');
         const meta = extractMigrationMetadata(sql);
         if (meta.log)
             console.log(`    ${meta.log}`);
     }
+    if (emptyMigrations.length > 0) {
+        console.log(`⚠ ${emptyMigrations.length} pending migration(s) contain no executable statements. ` +
+            'chkit migrate --apply refuses to run until each has SQL or is deleted.');
+    }
+    renderRetryNotice(retry);
 }
 export function renderPlanOnlyNotice() {
     console.log('\nPlan only. Re-run with --apply to apply and journal these migrations.');
@@ -95,9 +115,100 @@ export function emitApplySummaryJson(input) {
         ...(input.undeterminedScope.length > 0
             ? { undeterminedMigrations: input.undeterminedScope }
             : {}),
+        ...(input.retry ? { retry: input.retry } : {}),
     });
 }
 export function renderApplySummary() {
     console.log(`\nMigrations recorded in ClickHouse ${resolveJournalTableName()} table.`);
 }
+export function emitEmptyMigrationsBlockedJson(input) {
+    emitJson('migrate', {
+        mode: input.mode,
+        scope: input.scope,
+        error: EMPTY_MIGRATIONS_SUMMARY,
+        emptyMigrations: input.emptyMigrations,
+    });
+}
+export function emitAbandonJson(input) {
+    emitJson('migrate', { mode: input.mode, scope: input.scope, abandon: input.abandon });
+}
+/**
+ * The --abandon report: what stays applied in ClickHouse, what failed or was
+ * interrupted, and how to continue. `performed` is false for the preview. A
+ * statement an earlier --abandon marked failed is reported by the status it
+ * had before, so a statement that completed still shows as applied.
+ */
+export function renderAbandonText(report, input) {
+    const { migration } = report;
+    console.log(input.performed
+        ? `Abandoned in-progress migration ${migration}: every recorded statement is now marked failed.`
+        : `Abandoning in-progress migration ${migration} marks every recorded statement failed. Nothing has changed yet.`);
+    const completed = report.operations.filter((op) => statusBeforeAbandon(op) === 'completed');
+    if (completed.length === 0) {
+        console.log('No statement had completed.');
+    }
+    else {
+        console.log(`${completed.length} completed statement(s) remain applied in ClickHouse:`);
+        for (const op of completed) {
+            console.log(`  ${op.operationIndex + 1}. ${op.operationType} ${op.operationKey}`);
+        }
+    }
+    for (const op of report.operations) {
+        const statement = op.operationIndex + 1;
+        const status = statusBeforeAbandon(op);
+        if (status === 'failed') {
+            const reason = op.lastError.split('\n')[0]?.trim() ?? '';
+            console.log(reason === ''
+                ? `Statement ${statement} failed.`
+                : `Statement ${statement} failed: ${previewStatement(reason, 200)}`);
+        }
+        if (status === 'started') {
+            console.log(`Statement ${statement} was interrupted${op.queryId === '' ? '' : ` (query_id ${op.queryId})`}.`);
+            if (op.queryId !== '') {
+                console.log(`  ⚠ If that query is still running on the server, wait for it to finish or run KILL QUERY WHERE query_id = '${op.queryId}' before you apply ${migration} again.`);
+            }
+        }
+    }
+    console.log('');
+    if (!input.fileExists) {
+        console.log(`${migration} is no longer in the migrations directory, so no apply runs it again. If you still need its changes, restore the file, or regenerate them: restore ${input.snapshotFile} from git to its state before ${migration} was generated and run chkit generate. ${REPEATED_STATEMENTS_HINT}`);
+        return;
+    }
+    console.log(`Next: edit ${migration} if needed and run chkit migrate --apply. It runs again from statement 1, including the statements that completed, so they must be safe to run twice (for example CREATE ... IF NOT EXISTS), or remove them from the file. A column's MODIFY COLUMN ... REMOVE DEFAULT or REMOVE MATERIALIZED is not safe: it fails once the column has no such expression.`);
+    // chkit runs -- before-retry: only on the async path, and only for a record
+    // whose operation type and key still match (rebaseInProgressState).
+    console.log('A data load adds its rows again unless it is marked mode=async with a -- before-retry: line that undoes it. That line runs only for an async statement that keeps its position, operation type and key.');
+    console.log(`Or regenerate it: delete ${migration}, restore ${input.snapshotFile} from git to its state before ${migration} was generated, and run chkit generate. ${REPEATED_STATEMENTS_HINT}`);
+}
+export function renderAbandonPlanOnlyNotice() {
+    console.log('\nPlan only. Re-run with --apply to abandon the in-progress state.');
+}
+function renderRetryNotice(retry) {
+    if (!retry)
+        return;
+    for (const line of formatRetryNotice(retry))
+        console.log(line);
+}
+function formatRetryNotice(retry) {
+    const { migration } = retry;
+    if (retry.action === 'none') {
+        const reasons = {
+            already_applied: 'already applied; --retry has no effect.',
+            not_in_scope: 'outside the --table scope; --retry has no effect.',
+            empty_migration: 'no executable statements; --retry has no effect.',
+            not_in_progress: 'no in-progress journal state; it applies normally.',
+            checksum_unchanged: 'unchanged since it failed; it resumes without --retry.',
+        };
+        return [`Retry ${migration}: ${reasons[retry.reason]}`];
+    }
+    const progress = retry.resumeAtStatement === null
+        ? `All ${retry.totalStatements} statements already completed; the migration will be recorded as applied.`
+        : `${retry.completedStatements} completed statement(s) will be skipped; resuming at statement ${retry.resumeAtStatement} of ${retry.totalStatements}.`;
+    const lines = [`Retry ${migration}: the file changed after a failed apply. ${progress}`];
+    if (retry.unmarkedCompletedStatements > 0) {
+        lines.push(`⚠ ${retry.unmarkedCompletedStatements} completed statement(s) have no "-- operation:" marker and were matched by position only. ` +
+            'Do not add, remove, or reorder statements above the first statement that did not complete.');
+    }
+    return lines;
+}
 //# sourceMappingURL=output.js.map

package/dist/commands/migrate/output.js.map

@@ -1 +1 @@
-{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../src/commands/migrate/output.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../src/commands/migrate/output.ts"],"names":[],"mappings":"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"}

package/dist/commands/migrate/prompts.d.ts

@@ -2,5 +2,6 @@ import type { DestructiveOperationMarker } from '../../runtime/safety-markers.js
 export declare function isBackgroundOrCI(): boolean;
 export declare function printDestructiveOperationDetails(markers: DestructiveOperationMarker[]): void;
 export declare function confirmApply(): Promise<boolean>;
+export declare function confirmAbandon(migration: string): Promise<boolean>;
 export declare function confirmDestructiveExecution(markers: DestructiveOperationMarker[]): Promise<boolean>;
 //# sourceMappingURL=prompts.d.ts.map

package/dist/commands/migrate/prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../src/commands/migrate/prompts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAA;AAEjF,wBAAgB,gBAAgB,IAAI,OAAO,CAO1C;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAW5F;AAcD,wBAAgB,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,CAE/C;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,0BAA0B,EAAE,GACpC,OAAO,CAAC,OAAO,CAAC,CAGlB"}
+{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../src/commands/migrate/prompts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAA;AAEjF,wBAAgB,gBAAgB,IAAI,OAAO,CAO1C;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAW5F;AAcD,wBAAgB,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,CAE/C;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAElE;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,0BAA0B,EAAE,GACpC,OAAO,CAAC,OAAO,CAAC,CAGlB"}

package/dist/commands/migrate/prompts.js

@@ -33,6 +33,9 @@ async function promptYes(message) {
 export function confirmApply() {
     return promptYes('Apply pending migrations now? [no/yes]: ');
 }
+export function confirmAbandon(migration) {
+    return promptYes(`Abandon the in-progress state of ${migration} now? [no/yes]: `);
+}
 export async function confirmDestructiveExecution(markers) {
     printDestructiveOperationDetails(markers);
     return promptYes('Apply destructive operations? [no/yes]: ');

package/dist/commands/migrate/prompts.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/commands/migrate/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAIxD,MAAM,UAAU,gBAAgB;IAC9B,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG;QACtB,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM;QACzB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK;QACpB,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACtB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,OAAqC;IACpF,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;IAC/C,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC,CAAA;QAChD,OAAO,CAAC,GAAG,CAAC,iBAAiB,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;QACpC,OAAO,CAAC,GAAG,CAAC,eAAe,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;QAChD,OAAO,CAAC,GAAG,CAAC,cAAc,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,cAAc,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,sBAAsB,MAAM,CAAC,cAAc,EAAE,CAAC,CAAA;IAC5D,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,OAAe;IACtC,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IAC5E,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAA;QAC/D,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAC3C,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,KAAK,CAAA;IAChD,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAA;IACZ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,SAAS,CAAC,0CAA0C,CAAC,CAAA;AAC9D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,OAAqC;IAErC,gCAAgC,CAAC,OAAO,CAAC,CAAA;IACzC,OAAO,SAAS,CAAC,0CAA0C,CAAC,CAAA;AAC9D,CAAC"}
+{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/commands/migrate/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAIxD,MAAM,UAAU,gBAAgB;IAC9B,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG;QACtB,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM;QACzB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK;QACpB,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACtB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,OAAqC;IACpF,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;IAC/C,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC,CAAA;QAChD,OAAO,CAAC,GAAG,CAAC,iBAAiB,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,GAAG,EAAE,CAAC,CAAA;QACpC,OAAO,CAAC,GAAG,CAAC,eAAe,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;QAChD,OAAO,CAAC,GAAG,CAAC,cAAc,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,cAAc,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,sBAAsB,MAAM,CAAC,cAAc,EAAE,CAAC,CAAA;IAC5D,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,OAAe;IACtC,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IAC5E,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAA;QAC/D,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAC3C,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,KAAK,CAAA;IAChD,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAA;IACZ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,SAAS,CAAC,0CAA0C,CAAC,CAAA;AAC9D,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,SAAiB;IAC9C,OAAO,SAAS,CAAC,oCAAoC,SAAS,kBAAkB,CAAC,CAAA;AACnF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,OAAqC;IAErC,gCAAgC,CAAC,OAAO,CAAC,CAAA;IACzC,OAAO,SAAS,CAAC,0CAA0C,CAAC,CAAA;AAC9D,CAAC"}

package/dist/commands/migrate/recovery.d.ts

@@ -0,0 +1,90 @@
+import type { ParsedFlags } from '../../plugins.js';
+import type { MigrationRowState, OperationState, OperationStatus } from '../../runtime/journal-store.js';
+import type { MigrationOperationSummary } from '../../runtime/safety-markers.js';
+import { MigrateError } from './errors.js';
+export interface RecoveryTargets {
+    /** `--retry <migration>` as a file name. */
+    retryTarget: string | undefined;
+    /** `--abandon <migration>` as a file name. */
+    abandonTarget: string | undefined;
+}
+export interface StatementIdentity {
+    type: string;
+    key: string;
+    /** False for a statement without an `-- operation:` marker, matched by position only. */
+    marked: boolean;
+}
+export interface OperationMismatch {
+    /** 1-based statement number. */
+    statement: number;
+    /** `completed`, or `started` for an async statement that may still be running. */
+    status: OperationStatus;
+    queryId: string;
+    recorded: {
+        type: string;
+        key: string;
+    };
+    /** null when the edited file has no statement at that position. */
+    current: {
+        type: string;
+        key: string;
+    } | null;
+}
+/**
+ * A marker that a completed statement shares with other statements, which the
+ * edited file carries on fewer statements than the journal recorded.
+ */
+export interface SharedMarkerMismatch {
+    type: string;
+    key: string;
+    /** The statements the journal recorded with this marker (1-based), in file order. */
+    recorded: Array<{
+        statement: number;
+        status: OperationStatus;
+    }>;
+    /** How many statements of the edited file carry the marker. */
+    currentCount: number;
+}
+export type RetryEditCheck = {
+    ok: true;
+    completed: number;
+    unmarkedCompleted: number;
+    /** 0-based index of the first statement that did not complete; null when all did. */
+    resumeIndex: number | null;
+} | {
+    ok: false;
+    mismatches: OperationMismatch[];
+    sharedMarkers: SharedMarkerMismatch[];
+};
+/** Read --retry and --abandon; usage errors surface before any connection is made. */
+export declare function resolveRecoveryTargets(flags: ParsedFlags): RecoveryTargets;
+/** `name`, `name.sql` or a path to the file → `name.sql`. */
+export declare function normalizeMigrationName(raw: string, flag: '--retry' | '--abandon'): string;
+/** The (type, key) the journal records for statement `index`; apply and --retry share it. */
+export declare function statementIdentity(operations: readonly MigrationOperationSummary[], index: number): StatementIdentity;
+export declare function statementIdentities(operations: readonly MigrationOperationSummary[], statementCount: number): StatementIdentity[];
+/**
+ * Whether --retry may resume an in-progress migration with an edited file.
+ * apply skips completed statements and re-attaches a running async statement
+ * by position, so each of them must keep its position and operation marker.
+ * The journal records only type and key per statement, not its SQL.
+ */
+export declare function verifyRetryEdit(operations: readonly OperationState[], identities: readonly StatementIdentity[]): RetryEditCheck;
+export declare function retryMismatchError(migration: string, check: {
+    mismatches: readonly OperationMismatch[];
+    sharedMarkers: readonly SharedMarkerMismatch[];
+}): MigrateError;
+/**
+ * Re-key an in-progress state to an edited file. Completed statements stay
+ * recorded (--retry verified them). A failed or started statement stays only
+ * if the same operation still sits at its index, so a retry keeps its
+ * `-- before-retry:` compensation and query id; any other record is dropped.
+ */
+export declare function rebaseInProgressState(state: MigrationRowState, input: {
+    checksum: string;
+    identities: readonly StatementIdentity[];
+    appliedAt: string;
+}): MigrationRowState;
+/** Whether any statement of an in-progress state completed or may have run. */
+export declare function hasStatementProgress(state: MigrationRowState): boolean;
+//# sourceMappingURL=recovery.d.ts.map

package/dist/commands/migrate/recovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../../src/commands/migrate/recovery.ts"],"names":[],"mappings":"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"}

package/dist/commands/migrate/recovery.js

@@ -0,0 +1,163 @@
+import { MigrateError } from './errors.js';
+/** Flags that mean nothing next to --abandon, which only changes the journal. */
+const ABANDON_CONFLICTING_FLAGS = ['--retry', '--table', '--allow-destructive'];
+/** Read --retry and --abandon; usage errors surface before any connection is made. */
+export function resolveRecoveryTargets(flags) {
+    const retryRaw = flags['--retry'];
+    const abandonRaw = flags['--abandon'];
+    const retryTarget = typeof retryRaw === 'string' ? normalizeMigrationName(retryRaw, '--retry') : undefined;
+    const abandonTarget = typeof abandonRaw === 'string' ? normalizeMigrationName(abandonRaw, '--abandon') : undefined;
+    if (abandonTarget !== undefined) {
+        const conflicts = ABANDON_CONFLICTING_FLAGS.filter((name) => flags[name] !== undefined && flags[name] !== false);
+        if (conflicts.length > 0) {
+            throw new MigrateError('invalid_usage', `--abandon cannot be combined with ${conflicts.join(', ')}. It only resets the journal state of one migration and applies nothing.`);
+        }
+    }
+    return { retryTarget, abandonTarget };
+}
+/** `name`, `name.sql` or a path to the file → `name.sql`. */
+export function normalizeMigrationName(raw, flag) {
+    const base = raw.trim().split(/[\\/]/).pop()?.trim() ?? '';
+    if (base === '' || base === '.sql') {
+        throw new MigrateError('invalid_usage', `${flag} requires a migration file name, for example ${flag} 20260101000000_add_users.sql.`);
+    }
+    return base.endsWith('.sql') ? base : `${base}.sql`;
+}
+/** The (type, key) the journal records for statement `index`; apply and --retry share it. */
+export function statementIdentity(operations, index) {
+    const operation = operations[index];
+    return operation === undefined
+        ? { type: 'sql_statement', key: `statement:${index}`, marked: false }
+        : { type: operation.type, key: operation.key, marked: true };
+}
+export function statementIdentities(operations, statementCount) {
+    return Array.from({ length: statementCount }, (_, index) => statementIdentity(operations, index));
+}
+/**
+ * Whether --retry may resume an in-progress migration with an edited file.
+ * apply skips completed statements and re-attaches a running async statement
+ * by position, so each of them must keep its position and operation marker.
+ * The journal records only type and key per statement, not its SQL.
+ */
+export function verifyRetryEdit(operations, identities) {
+    const bound = operations
+        .filter(isBoundToPosition)
+        .sort((a, b) => a.operationIndex - b.operationIndex);
+    const mismatches = [];
+    let completed = 0;
+    let unmarkedCompleted = 0;
+    for (const op of bound) {
+        const current = identities[op.operationIndex];
+        if (current === undefined || !sameIdentity(current, op)) {
+            mismatches.push({
+                statement: op.operationIndex + 1,
+                status: op.status,
+                queryId: op.queryId,
+                recorded: markerOf(op),
+                current: current === undefined ? null : { type: current.type, key: current.key },
+            });
+            continue;
+        }
+        if (op.status !== 'completed')
+            continue;
+        completed += 1;
+        if (!current.marked)
+            unmarkedCompleted += 1;
+    }
+    const sharedMarkers = findSharedMarkerMismatches(operations, identities, mismatches);
+    if (mismatches.length > 0 || sharedMarkers.length > 0)
+        return { ok: false, mismatches, sharedMarkers };
+    const done = new Set(operations.filter((op) => op.status === 'completed').map((op) => op.operationIndex));
+    const resumeIndex = identities.findIndex((_, index) => !done.has(index));
+    return { ok: true, completed, unmarkedCompleted, resumeIndex: resumeIndex === -1 ? null : resumeIndex };
+}
+export function retryMismatchError(migration, check) {
+    const { mismatches, sharedMarkers } = check;
+    const lines = mismatches.map((mismatch) => {
+        const { statement, recorded, current } = mismatch;
+        const label = mismatch.status === 'completed'
+            ? `completed as ${recorded.type} ${recorded.key}`
+            : `started as ${recorded.type} ${recorded.key} (async query_id ${mismatch.queryId})`;
+        const found = current === null
+            ? `the edited file has no statement ${statement}`
+            : `the edited file has ${current.type} ${current.key} there`;
+        return `  statement ${statement}: ${label}, but ${found}`;
+    });
+    const sharedLines = sharedMarkers.map((shared) => {
+        const statements = joinWithAnd(shared.recorded.map(({ statement, status }) => `${statement} (${status})`));
+        const count = `${shared.currentCount} statement${shared.currentCount === 1 ? '' : 's'}`;
+        return `  statements ${statements} share ${shared.type} ${shared.key}, but the edited file has ${count} with that marker`;
+    });
+    const sharedHint = sharedMarkers.length === 0
+        ? ''
+        : "\nStatements that share a marker, such as a column's REMOVE DEFAULT and the MODIFY COLUMN after it, are told apart only by position, so chkit cannot tell which one the edit removed. Keep each of them and edit only the one that failed.";
+    const running = mismatches.filter((mismatch) => mismatch.status === 'started');
+    const runningHint = running.map((mismatch) => `\nStatement ${mismatch.statement} may still be running on the server. Wait for it to finish or run KILL QUERY WHERE query_id = '${mismatch.queryId}' before you abandon the partial run.`);
+    return new MigrateError('retry_mismatch', `Cannot retry ${migration}: statements that completed or may still be running no longer match the edited file.\n` +
+        `${[...lines, ...sharedLines].join('\n')}\n` +
+        'chkit skips completed statements and re-attaches running async statements by position, so they must keep their position and operation marker.' +
+        sharedHint +
+        runningHint.join('') +
+        `\nRestore them, or discard the partial run so the next apply starts the file over: chkit migrate --apply --abandon ${migration}`);
+}
+/**
+ * Re-key an in-progress state to an edited file. Completed statements stay
+ * recorded (--retry verified them). A failed or started statement stays only
+ * if the same operation still sits at its index, so a retry keeps its
+ * `-- before-retry:` compensation and query id; any other record is dropped.
+ */
+export function rebaseInProgressState(state, input) {
+    const operations = state.operations.filter((op) => {
+        if (op.status === 'completed')
+            return true;
+        const current = input.identities[op.operationIndex];
+        return current !== undefined && sameIdentity(current, op);
+    });
+    return { ...state, checksum: input.checksum, appliedAt: input.appliedAt, operations };
+}
+/** Whether any statement of an in-progress state completed or may have run. */
+export function hasStatementProgress(state) {
+    return state.operations.some((op) => op.status === 'completed' || op.status === 'started');
+}
+/**
+ * Statements can share a marker: a column's generated `REMOVE DEFAULT` or
+ * `REMOVE MATERIALIZED` carries the type and key of the MODIFY COLUMN after
+ * it. When a completed statement holds such a marker and the edited file
+ * carries it on fewer statements than the journal recorded, the position
+ * check cannot tell which one the edit removed: deleting the completed REMOVE
+ * slides the MODIFY into its slot, where apply would skip it as completed.
+ * A marker that a positional mismatch already reports is left out.
+ */
+function findSharedMarkerMismatches(operations, identities, mismatches) {
+    const markers = operations
+        .filter(isBoundToPosition)
+        .map(markerOf)
+        .filter((marker, index, all) => all.findIndex((other) => sameMarker(other, marker)) === index)
+        .filter((marker) => !mismatches.some((mismatch) => sameMarker(mismatch.recorded, marker)));
+    return markers.flatMap((marker) => {
+        const recorded = operations
+            .filter((op) => sameMarker(markerOf(op), marker))
+            .sort((a, b) => a.operationIndex - b.operationIndex)
+            .map((op) => ({ statement: op.operationIndex + 1, status: op.status }));
+        const currentCount = identities.filter((identity) => sameMarker(identity, marker)).length;
+        return currentCount < recorded.length ? [{ ...marker, recorded, currentCount }] : [];
+    });
+}
+// A completed statement, or an async statement whose query may still be running.
+function isBoundToPosition(op) {
+    return op.status === 'completed' || (op.status === 'started' && op.queryId !== '');
+}
+function sameIdentity(identity, op) {
+    return sameMarker(identity, markerOf(op));
+}
+function markerOf(op) {
+    return { type: op.operationType, key: op.operationKey };
+}
+function sameMarker(a, b) {
+    return a.type === b.type && a.key === b.key;
+}
+/** `['1', '2', '3']` → `1, 2 and 3`. */
+function joinWithAnd(items) {
+    return items.length <= 1 ? items.join('') : `${items.slice(0, -1).join(', ')} and ${items.at(-1)}`;
+}
+//# sourceMappingURL=recovery.js.map

package/dist/commands/migrate/recovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../../src/commands/migrate/recovery.ts"],"names":[],"mappings":"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"}

package/dist/commands/migrate/retry.d.ts

@@ -0,0 +1,37 @@
+import type { JournalStore } from '../../runtime/journal-store.js';
+export interface RetryResume {
+    action: 'resume';
+    migration: string;
+    previousChecksum: string;
+    checksum: string;
+    totalStatements: number;
+    completedStatements: number;
+    /** 1-based number of the first statement that runs; null when every statement already completed. */
+    resumeAtStatement: number | null;
+    /** Completed statements without an `-- operation:` marker, matched by position only. */
+    unmarkedCompletedStatements: number;
+}
+export type RetryNoopReason = 'already_applied' | 'not_in_scope' | 'empty_migration' | 'not_in_progress' | 'checksum_unchanged';
+export interface RetryNoop {
+    action: 'none';
+    migration: string;
+    reason: RetryNoopReason;
+}
+export type RetryResolution = RetryResume | RetryNoop;
+/**
+ * Decide what --retry <migration> does in this run, before anything is
+ * applied. A target that is not an edited in-progress migration is a no-op,
+ * so the same command can run against every environment; an edit that moved
+ * or changed a statement that already ran throws `retry_mismatch`.
+ */
+export declare function resolveRetry(input: {
+    migration: string;
+    migrationsDir: string;
+    pending: readonly string[];
+    /** Pending files without executable statements, which apply refuses. */
+    emptyMigrations: readonly string[];
+    appliedNames: ReadonlySet<string>;
+}, deps: {
+    journalStore: JournalStore;
+}): Promise<RetryResolution>;
+//# sourceMappingURL=retry.d.ts.map

package/dist/commands/migrate/retry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../../src/commands/migrate/retry.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAQlE,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,QAAQ,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,oGAAoG;IACpG,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,wFAAwF;IACxF,2BAA2B,EAAE,MAAM,CAAA;CACpC;AAED,MAAM,MAAM,eAAe,GACvB,iBAAiB,GACjB,cAAc,GACd,iBAAiB,GACjB,iBAAiB,GACjB,oBAAoB,CAAA;AAExB,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,eAAe,CAAA;CACxB;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,GAAG,SAAS,CAAA;AAErD;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE;IACL,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1B,wEAAwE;IACxE,eAAe,EAAE,SAAS,MAAM,EAAE,CAAA;IAClC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAClC,EACD,IAAI,EAAE;IAAE,YAAY,EAAE,YAAY,CAAA;CAAE,GACnC,OAAO,CAAC,eAAe,CAAC,CA6B1B"}

package/dist/commands/migrate/retry.js

@@ -0,0 +1,46 @@
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { checksumSQL } from '../../runtime/migration-store.js';
+import { extractExecutableStatements, extractMigrationOperationSummaries, } from '../../runtime/safety-markers.js';
+import { retryMismatchError, statementIdentities, verifyRetryEdit } from './recovery.js';
+/**
+ * Decide what --retry <migration> does in this run, before anything is
+ * applied. A target that is not an edited in-progress migration is a no-op,
+ * so the same command can run against every environment; an edit that moved
+ * or changed a statement that already ran throws `retry_mismatch`.
+ */
+export async function resolveRetry(input, deps) {
+    const { migration } = input;
+    if (input.appliedNames.has(migration))
+        return { action: 'none', migration, reason: 'already_applied' };
+    if (!input.pending.includes(migration))
+        return { action: 'none', migration, reason: 'not_in_scope' };
+    if (input.emptyMigrations.includes(migration))
+        return { action: 'none', migration, reason: 'empty_migration' };
+    const state = await deps.journalStore.readMigrationState(migration);
+    if (state === null)
+        return { action: 'none', migration, reason: 'not_in_progress' };
+    if (state.migrationCompleted)
+        return { action: 'none', migration, reason: 'already_applied' };
+    const sql = await readFile(join(input.migrationsDir, migration), 'utf8');
+    const checksum = checksumSQL(sql);
+    if (state.checksum === checksum)
+        return { action: 'none', migration, reason: 'checksum_unchanged' };
+    // The file's statements before onBeforeApply; apply checks again against the
+    // statements the plugins return.
+    const identities = statementIdentities(extractMigrationOperationSummaries(sql), extractExecutableStatements(sql).length);
+    const check = verifyRetryEdit(state.operations, identities);
+    if (!check.ok)
+        throw retryMismatchError(migration, check);
+    return {
+        action: 'resume',
+        migration,
+        previousChecksum: state.checksum,
+        checksum,
+        totalStatements: identities.length,
+        completedStatements: check.completed,
+        resumeAtStatement: check.resumeIndex === null ? null : check.resumeIndex + 1,
+        unmarkedCompletedStatements: check.unmarkedCompleted,
+    };
+}
+//# sourceMappingURL=retry.js.map

package/dist/commands/migrate/retry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../src/commands/migrate/retry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAGhC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EACL,2BAA2B,EAC3B,kCAAkC,GACnC,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AA8BxF;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAOC,EACD,IAAoC;IAEpC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAA;IAC3B,IAAI,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;IACtG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,CAAA;IACpG,IAAI,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;IAC9G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAA;IACnE,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;IACnF,IAAI,KAAK,CAAC,kBAAkB;QAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;IAC7F,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,CAAA;IACxE,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAA;IACnG,6EAA6E;IAC7E,iCAAiC;IACjC,MAAM,UAAU,GAAG,mBAAmB,CACpC,kCAAkC,CAAC,GAAG,CAAC,EACvC,2BAA2B,CAAC,GAAG,CAAC,CAAC,MAAM,CACxC,CAAA;IACD,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;IAC3D,IAAI,CAAC,KAAK,CAAC,EAAE;QAAE,MAAM,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;IACzD,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,SAAS;QACT,gBAAgB,EAAE,KAAK,CAAC,QAAQ;QAChC,QAAQ;QACR,eAAe,EAAE,UAAU,CAAC,MAAM;QAClC,mBAAmB,EAAE,KAAK,CAAC,SAAS;QACpC,iBAAiB,EAAE,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC;QAC5E,2BAA2B,EAAE,KAAK,CAAC,iBAAiB;KACrD,CAAA;AACH,CAAC"}

package/dist/commands/plugin.js

@@ -86,7 +86,9 @@ async function cmdPlugin(ctx) {
     const tableSelector = gf['--table'];
     let tableScope;
     try {
-        const definitions = await loadSchemaDefinitions(ctx.config.schema);
+        // Without --table the scope is unfiltered, so only a selector needs the schema.
+        // A plugin command that needs it loads it and reports its load errors itself.
+        const definitions = tableSelector ? await loadSchemaDefinitions(ctx.config.schema) : [];
         tableScope = resolveTableScope(tableSelector, tableKeysFromDefinitions(definitions));
     }
     catch {