@abloatai/transaction 0.59.0 → 0.59.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/schema/deployment/index.d.ts.map +1 -1
  2. package/dist/schema/deployment/index.js +52 -3
  3. package/dist/schema/deployment/index.js.map +1 -1
  4. package/dist/schema/deployment/reconcile.d.ts +2 -2
  5. package/dist/schema/deployment/reconcile.d.ts.map +1 -1
  6. package/dist/schema/deployment/reconcile.js +98 -6
  7. package/dist/schema/deployment/reconcile.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/schema/deployment/index.ts +54 -3
  10. package/src/schema/deployment/reconcile.ts +122 -6
package/dist/schema/deployment/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schema/deployment/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAKzH,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAChM,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AASrC,6EAA6E;AAC7E,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,qBAAqB,EAAE,GAAG,SAA2B,GAAG,oBAAoB,CAsClI;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,qBAAqB,EAAE,UAAU,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtF;AAED,mFAAmF;AACnF,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,gCAAgC,EAAE,IAAI,GAAE,MAAM,GAAG,OAAgB,GAAG,OAAO,CAAC,oBAAoB,GAAG,qBAAqB,CAAC,CAYpL"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schema/deployment/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAqB,qBAAqB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAK5I,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAChM,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AA8BrC,6EAA6E;AAC7E,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,qBAAqB,EAAE,GAAG,SAA2B,GAAG,oBAAoB,CAoElI;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,qBAAqB,EAAE,UAAU,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtF;AAED,mFAAmF;AACnF,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,gCAAgC,EAAE,IAAI,GAAE,MAAM,GAAG,OAAgB,GAAG,OAAO,CAAC,oBAAoB,GAAG,qBAAqB,CAAC,CAYpL"}
package/dist/schema/deployment/index.js CHANGED
@@ -7,6 +7,25 @@ export { reconcileClientToActive, reconcileDeploymentManifest, reconcilePolicyIn
7
7
  export { sequenceDeployment } from './sequence.js';
8
8
  export * from './backfill.js';
9
9
  export * from './postgresCatalog.js';
10
+ function physicalEvidenceKey(finding) {
11
+ return JSON.stringify([
12
+ finding.code,
13
+ finding.category,
14
+ finding.severity,
15
+ finding.phase,
16
+ finding.owner,
17
+ finding.model,
18
+ finding.field,
19
+ finding.column,
20
+ finding.from,
21
+ finding.to,
22
+ finding.message,
23
+ finding.action,
24
+ ]);
25
+ }
26
+ function physicalResourceKey(finding) {
27
+ return JSON.stringify([finding.model, finding.column, finding.field]);
28
+ }
10
29
  function planStates(observation) {
11
30
  const { schema: _sourceSchema, ...source } = observation.source;
12
31
  const active = observation.active ? (({ schema: _activeSchema, ...state }) => state)(observation.active) : null;
@@ -15,14 +34,44 @@ function planStates(observation) {
15
34
  }
16
35
  /** The one pure reconciliation skeleton every lifecycle surface projects. */
17
36
  export function buildSchemaDeploymentPlan(observation, now = new Date().toISOString()) {
18
- const sourceToActive = reconcileSourceToActiveResult(observation.active?.schema ?? null, observation.source.schema, observation.intent?.renames, observation.intent?.backfills);
37
+ const sourceToActive = reconcileSourceToActiveResult(observation.active?.schema ?? null, observation.source.schema, observation.intent?.renames, observation.intent?.backfills, observation.database);
19
38
  const provision = reconcileSourceToActiveResult(null, observation.source.schema).operations;
39
+ const sourceToDatabase = reconcileSchemaToDatabase(observation.source.schema, observation.database, 'source_to_database');
40
+ const sourcePhysicalEvidence = new Set(sourceToDatabase.map(physicalEvidenceKey));
41
+ const sourcePhysicalResources = new Set(sourceToDatabase.map(physicalResourceKey));
42
+ const activeDatabaseFindings = observation.active
43
+ ? reconcileSchemaToDatabase(observation.active.schema, observation.database, 'active_to_database')
44
+ : [];
45
+ const candidateAlignedActiveFindings = [];
46
+ const activeToDatabase = activeDatabaseFindings.filter((finding) => {
47
+ if (sourcePhysicalEvidence.has(physicalEvidenceKey(finding)))
48
+ return false;
49
+ if (!sourcePhysicalResources.has(physicalResourceKey(finding))) {
50
+ candidateAlignedActiveFindings.push(finding);
51
+ return false;
52
+ }
53
+ return true;
54
+ });
55
+ const candidateAlignmentEvidence = candidateAlignedActiveFindings.length === 0 ? [] : [{
56
+ id: 'active_to_database:candidate_alignment_verified',
57
+ code: 'candidate_alignment_verified',
58
+ category: 'observation',
59
+ severity: 'info',
60
+ direction: 'active_to_database',
61
+ phase: 'verify',
62
+ owner: observation.database?.ownership === 'ablo' ? 'ablo' : 'application_migration',
63
+ from: { activePhysicalDifferences: candidateAlignedActiveFindings.length },
64
+ to: 'source_database_alignment',
65
+ message: `PostgreSQL differs from the active artifact at ${candidateAlignedActiveFindings.length} physical contract location(s), and the candidate source already matches those locations.`,
66
+ action: 'Treat these differences as completed expand work; review the remaining source-to-active compatibility findings before activation.',
67
+ }];
20
68
  const findings = [
21
69
  ...reconcilePolicyIntent(observation.source.schema),
22
70
  ...reconcileDeploymentManifest(observation.intent?.manifest),
23
71
  ...sourceToActive.findings,
24
- ...reconcileSchemaToDatabase(observation.source.schema, observation.database, 'source_to_database'),
25
- ...(observation.active ? reconcileSchemaToDatabase(observation.active.schema, observation.database, 'active_to_database') : []),
72
+ ...sourceToDatabase,
73
+ ...activeToDatabase,
74
+ ...candidateAlignmentEvidence,
26
75
  ...(observation.supplementalFindings ?? []),
27
76
  ];
28
77
  const unique = [...new Map(findings.map((finding) => [finding.id, finding])).values()].map((finding) => observation.intent?.acceptDestructive && finding.category === 'destructive_contract' &&
package/dist/schema/deployment/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/schema/deployment/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/schema/deployment/index.ts"],"names":[],"mappings":"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"}
package/dist/schema/deployment/reconcile.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  import { type BackfillValue, type MigrationStep, type RenameHints } from '../diff.js';
2
2
  import type { SchemaJSON } from '../serialize.js';
3
3
  import type { DatabaseSnapshot, DeploymentFinding, DeploymentManifest } from './contracts.js';
4
- export declare function reconcileSourceToActive(active: SchemaJSON | null, source: SchemaJSON, hints?: RenameHints, backfills?: readonly BackfillValue[]): readonly DeploymentFinding[];
5
- export declare function reconcileSourceToActiveResult(active: SchemaJSON | null, source: SchemaJSON, hints?: RenameHints, backfills?: readonly BackfillValue[]): {
4
+ export declare function reconcileSourceToActive(active: SchemaJSON | null, source: SchemaJSON, hints?: RenameHints, backfills?: readonly BackfillValue[], database?: DatabaseSnapshot | null): readonly DeploymentFinding[];
5
+ export declare function reconcileSourceToActiveResult(active: SchemaJSON | null, source: SchemaJSON, hints?: RenameHints, backfills?: readonly BackfillValue[], database?: DatabaseSnapshot | null): {
6
6
  operations: readonly MigrationStep[];
7
7
  findings: readonly DeploymentFinding[];
8
8
  };
package/dist/schema/deployment/reconcile.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../../src/schema/deployment/reconcile.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqD,KAAK,aAAa,EAAwB,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAC/J,OAAO,KAAK,EAAa,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAuB,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AA8CnH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,GAAE,WAAgB,EAAE,SAAS,GAAE,SAAS,aAAa,EAAO,GAAG,SAAS,iBAAiB,EAAE,CAEtL;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,GAAE,WAAgB,EAAE,SAAS,GAAE,SAAS,aAAa,EAAO,GAAG;IAAE,UAAU,EAAE,SAAS,aAAa,EAAE,CAAC;IAAC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAA;CAAE,CAsBhP;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,iBAAiB,EAAE,CAKtF;AAiED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI,EAAE,SAAS,EAAE,oBAAoB,GAAG,oBAAoB,GAAG,SAAS,iBAAiB,EAAE,CAGrL;AAED,4EAA4E;AAC5E,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,WAAW,EAAE,MAAM,EACnB,gBAAgB,GAAE,SAAS;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAO,GACvI,SAAS,iBAAiB,EAAE,CAsB9B;AAED,6FAA6F;AAC7F,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,GAAG,SAAS,iBAAiB,EAAE,CAiClH"}
1
+ {"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../../src/schema/deployment/reconcile.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqD,KAAK,aAAa,EAAwB,KAAK,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAC/J,OAAO,KAAK,EAAa,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAuB,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AA2FnH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,MAAM,EAAE,UAAU,EAClB,KAAK,GAAE,WAAgB,EACvB,SAAS,GAAE,SAAS,aAAa,EAAO,EACxC,QAAQ,GAAE,gBAAgB,GAAG,IAAW,GACvC,SAAS,iBAAiB,EAAE,CAE9B;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,MAAM,EAAE,UAAU,EAClB,KAAK,GAAE,WAAgB,EACvB,SAAS,GAAE,SAAS,aAAa,EAAO,EACxC,QAAQ,GAAE,gBAAgB,GAAG,IAAW,GACvC;IAAE,UAAU,EAAE,SAAS,aAAa,EAAE,CAAC;IAAC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAA;CAAE,CAiFlF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,iBAAiB,EAAE,CAKtF;AAiED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,gBAAgB,GAAG,IAAI,EAAE,SAAS,EAAE,oBAAoB,GAAG,oBAAoB,GAAG,SAAS,iBAAiB,EAAE,CAGrL;AAED,4EAA4E;AAC5E,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,WAAW,EAAE,MAAM,EACnB,gBAAgB,GAAE,SAAS;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAO,GACvI,SAAS,iBAAiB,EAAE,CAsB9B;AAED,6FAA6F;AAC7F,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,kBAAkB,GAAG,SAAS,GAAG,SAAS,iBAAiB,EAAE,CAiClH"}
package/dist/schema/deployment/reconcile.js CHANGED
@@ -48,14 +48,64 @@ function stepFinding(step) {
48
48
  message: `Field "${step.model}.${step.field}" changes shape.`, action: 'Apply the ordered physical and compatibility changes, then verify old and current clients.',
49
49
  };
50
50
  }
51
- export function reconcileSourceToActive(active, source, hints = {}, backfills = []) {
52
- return reconcileSourceToActiveResult(active, source, hints, backfills).findings;
51
+ function databaseSatisfiesRequiredField(signal, source, database) {
52
+ if (!database || (signal.code !== 'required_field_added' && signal.code !== 'made_required') || !signal.field)
53
+ return false;
54
+ const model = source.models[signal.model];
55
+ const field = model?.fields[signal.field];
56
+ if (!model || !field || field.isOptional)
57
+ return false;
58
+ const table = database.tables[model.tableName ?? signal.model];
59
+ const column = table?.columns[field.column ?? camelToSnake(signal.field)];
60
+ return column !== undefined &&
61
+ !column.nullable &&
62
+ (column.nullCount === undefined || column.nullCount === null || column.nullCount === 0) &&
63
+ normalizePgType(column.dataType) === sqlType(field.type);
53
64
  }
54
- export function reconcileSourceToActiveResult(active, source, hints = {}, backfills = []) {
65
+ function databaseSatisfiesRiskyCast(signal, source, database) {
66
+ if (!database || signal.code !== 'risky_cast' || !signal.field)
67
+ return false;
68
+ const model = source.models[signal.model];
69
+ const field = model?.fields[signal.field];
70
+ // A TEXT column does not prove that existing rows satisfy a newly narrowed
71
+ // enum CHECK constraint; the catalog snapshot currently observes type only.
72
+ if (!model || !field || field.type === 'enum')
73
+ return false;
74
+ const table = database.tables[model.tableName ?? signal.model];
75
+ const column = table?.columns[field.column ?? camelToSnake(signal.field)];
76
+ return column !== undefined && normalizePgType(column.dataType) === sqlType(field.type);
77
+ }
78
+ function databasePreservesRemovedApplicationModel(signal, active, source, database) {
79
+ if (!active || !database || database.ownership !== 'application' || signal.code !== 'drop_model')
80
+ return false;
81
+ if (source.models[signal.model])
82
+ return false;
83
+ const activeModel = active.models[signal.model];
84
+ return activeModel !== undefined && database.tables[activeModel.tableName ?? signal.model] !== undefined;
85
+ }
86
+ export function reconcileSourceToActive(active, source, hints = {}, backfills = [], database = null) {
87
+ return reconcileSourceToActiveResult(active, source, hints, backfills, database).findings;
88
+ }
89
+ export function reconcileSourceToActiveResult(active, source, hints = {}, backfills = [], database = null) {
55
90
  const steps = diffSchema(active, source, hints);
56
91
  const classification = classifyMigration(steps);
57
- const signals = [...unresolvedBlockers(classification, backfills), ...classification.warnings].map((signal) => signalFinding(signal, 'source_to_active'));
58
- const signalLocations = new Set(signals.map(({ model, field }) => `${model}:${field ?? ''}`));
92
+ const blockers = unresolvedBlockers(classification, backfills);
93
+ const requiredFieldsVerified = blockers.filter((signal) => databaseSatisfiesRequiredField(signal, source, database));
94
+ const typeCorrectionsVerified = classification.warnings.filter((signal) => databaseSatisfiesRiskyCast(signal, source, database));
95
+ const removedApplicationModelsPreserved = classification.warnings.filter((signal) => databasePreservesRemovedApplicationModel(signal, active, source, database));
96
+ const databaseVerified = new Set([
97
+ ...requiredFieldsVerified,
98
+ ...typeCorrectionsVerified,
99
+ ...removedApplicationModelsPreserved,
100
+ ]);
101
+ const signals = [
102
+ ...blockers.filter((signal) => !databaseVerified.has(signal)),
103
+ ...classification.warnings.filter((signal) => !databaseVerified.has(signal)),
104
+ ].map((signal) => signalFinding(signal, 'source_to_active'));
105
+ // Keep every classified location out of the ordinary step findings, including
106
+ // blockers discharged by observed PostgreSQL evidence. Otherwise a verified
107
+ // required field falls through and is emitted again as an add_field blocker.
108
+ const signalLocations = new Set([...blockers, ...classification.warnings].map(({ model, field }) => `${model}:${field ?? ''}`));
59
109
  const ordinary = steps
60
110
  .map(stepFinding)
61
111
  .filter((finding) => finding !== null)
@@ -72,7 +122,49 @@ export function reconcileSourceToActiveResult(active, source, hints = {}, backfi
72
122
  }
73
123
  : finding;
74
124
  });
75
- return { operations: steps, findings: [...signals, ...ordinary] };
125
+ const requiredFieldEvidence = requiredFieldsVerified.length === 0 ? [] : [{
126
+ id: 'source_to_active:database_migration_verified',
127
+ code: 'database_migration_verified',
128
+ category: 'data_movement',
129
+ severity: 'info',
130
+ direction: 'source_to_active',
131
+ phase: 'verify',
132
+ owner: database?.ownership === 'ablo' ? 'ablo' : 'application_migration',
133
+ from: { requiredChanges: requiredFieldsVerified.length },
134
+ to: 'satisfied',
135
+ message: `PostgreSQL already enforces ${requiredFieldsVerified.length} required field migration(s) absent from the active artifact.`,
136
+ action: 'No synthetic backfill declaration is needed; preserve the matching non-null columns and activate the reviewed schema.',
137
+ }];
138
+ const typeCorrectionEvidence = typeCorrectionsVerified.length === 0 ? [] : [{
139
+ id: 'source_to_active:database_type_correction_verified',
140
+ code: 'database_type_correction_verified',
141
+ category: 'destructive_contract',
142
+ severity: 'info',
143
+ direction: 'source_to_active',
144
+ phase: 'verify',
145
+ owner: database?.ownership === 'ablo' ? 'ablo' : 'application_migration',
146
+ from: { typeCorrections: typeCorrectionsVerified.length },
147
+ to: 'source_database_alignment',
148
+ message: `PostgreSQL already matches ${typeCorrectionsVerified.length} candidate field type correction(s) that differ from the active artifact.`,
149
+ action: 'No physical cast is needed; activate the reviewed schema and use forward recovery because the prior artifact no longer matches PostgreSQL.',
150
+ }];
151
+ const removedModelEvidence = removedApplicationModelsPreserved.length === 0 ? [] : [{
152
+ id: 'source_to_active:application_model_removal_verified',
153
+ code: 'application_model_removal_verified',
154
+ category: 'compatibility',
155
+ severity: 'warning',
156
+ direction: 'source_to_active',
157
+ phase: 'verify',
158
+ owner: 'application',
159
+ from: { removedModels: removedApplicationModelsPreserved.length },
160
+ to: 'physical_tables_preserved',
161
+ message: `${removedApplicationModelsPreserved.length} model removal(s) only change the served schema; their application-owned PostgreSQL tables remain present.`,
162
+ action: 'Verify no supported client still reads these models, then activate; Ablo will not drop the preserved application tables.',
163
+ }];
164
+ return {
165
+ operations: steps,
166
+ findings: [...signals, ...requiredFieldEvidence, ...typeCorrectionEvidence, ...removedModelEvidence, ...ordinary],
167
+ };
76
168
  }
77
169
  export function reconcilePolicyIntent(source) {
78
170
  return auditSchemaAccessPolicies(source).map((finding) => ({
package/dist/schema/deployment/reconcile.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/schema/deployment/reconcile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,kBAAkB,EAAkF,MAAM,YAAY,CAAC;AAE/J,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAG9D,MAAM,EAAE,GAAG,CAAC,GAAG,KAAsC,EAAU,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAElG,SAAS,aAAa,CAAC,MAAuB,EAAE,SAA8B;IAC5E,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7H,OAAO;QACL,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI;QAC7E,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,eAAe,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QAC7G,SAAS,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK;QAC5G,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM;QACxE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,+EAA+E,CAAC,CAAC,CAAC,kEAAkE;KAC3K,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAmB;IACtC,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,IAAI,CAAC;IAC1E,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc;QAAE,OAAO;YACvC,EAAE,EAAE,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,kBAAkB;YAC9I,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS;YACjF,OAAO,EAAE,UAAU,IAAI,CAAC,KAAK,sCAAsC,EAAE,MAAM,EAAE,mEAAmE;SACjJ,CAAC;IACF,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW;QAAE,OAAO;YACpC,EAAE,EAAE,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,kBAAkB;YAC7L,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,uBAAuB,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK;YACrH,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACpF,OAAO,EAAE,UAAU,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,sCAAsC;YACjF,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,iEAAiE,CAAC,CAAC,CAAC,wFAAwF;SAC5L,CAAC;IACF,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc;QAAE,OAAO;YACvC,EAAE,EAAE,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB;YACzJ,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE;YACvF,OAAO,EAAE,UAAU,IAAI,CAAC,IAAI,oBAAoB,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,uEAAuE;SAC7I,CAAC;IACF,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc;QAAE,OAAO;YACvC,EAAE,EAAE,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB;YACrK,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE;YAC1G,OAAO,EAAE,UAAU,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,oBAAoB,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,wEAAwE;SAC5J,CAAC;IACF,OAAO;QACL,EAAE,EAAE,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB;QAC7J,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO;QAC7G,OAAO,EAAE,UAAU,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,kBAAkB,EAAE,MAAM,EAAE,4FAA4F;KACpK,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAAyB,EAAE,MAAkB,EAAE,QAAqB,EAAE,EAAE,YAAsC,EAAE;IACtJ,OAAO,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,MAAyB,EAAE,MAAkB,EAAE,QAAqB,EAAE,EAAE,YAAsC,EAAE;IAC5J,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAChD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,CAAC,GAAG,kBAAkB,CAAC,cAAc,EAAE,SAAS,CAAC,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAC1J,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9F,MAAM,QAAQ,GAAG,KAAK;SACnB,GAAG,CAAC,WAAW,CAAC;SAChB,MAAM,CAAC,CAAC,OAAO,EAAgC,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC;SACnE,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC,CAAC;SACpF,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS;YAC5E,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;QACrG,OAAO,WAAW,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;YAClF,CAAC,CAAC;gBACE,GAAG,OAAO;gBACV,QAAQ,EAAE,MAAe;gBACzB,KAAK,EAAE,UAAmB;gBAC1B,MAAM,EAAE,qFAAqF;aAC9F;YACH,CAAC,CAAC,OAAO,CAAC;IACd,CAAC,CAAC,CAAC;IACL,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,OAAO,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAkB;IACtD,OAAO,yBAAyB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACzD,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB;QAChJ,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG;KAC3G,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IACjC,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;QAAE,OAAO,aAAa,CAAC;IACrD,IAAI,IAAI,KAAK,kBAAkB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,kBAAkB,CAAC;IAC5H,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACzC,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,OAAO;QAAE,OAAO,OAAO,CAAC;IACxD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,KAAgB;IACvC,MAAM,SAAS,GAAG,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IACvD,OAAO;QACL,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE;QAC9D,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5F,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;KACrL,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAkB,EAAE,QAA0B,EAAE,SAAsD;IAC9H,MAAM,QAAQ,GAAwB,EAAE,CAAC;IACzC,MAAM,aAAa,GAAG,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,uBAAuB,CAAC;IACvF,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,SAAS;YAAE,SAAS;QACtD,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,QAAQ,CAAC;QAC9C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,QAAQ,CAAC,SAAS,IAAI,SAAS,eAAe,EAAE,MAAM,EAAE,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,kDAAkD,CAAC,CAAC,CAAC,0EAA0E,EAAE,CAAC,CAAC;YAC9f,SAAS;QACX,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC9C,MAAM,IAAI,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YACpE,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,gBAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,gBAAgB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,SAAS,IAAI,QAAQ,CAAC,MAAM,eAAe,EAAE,MAAM,EAAE,QAAQ,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,kDAAkD,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,sFAAsF,CAAC,CAAC,CAAC,+EAA+E,EAAE,CAAC,CAAC;gBACruB,SAAS;YACX,CAAC;YACD,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM;gBAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,SAAS,IAAI,QAAQ,CAAC,MAAM,uDAAuD,EAAE,MAAM,EAAE,kFAAkF,EAAE,CAAC,CAAC;YACxjB,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACpD,IAAI,UAAU,KAAK,QAAQ,CAAC,IAAI;gBAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,sBAAsB,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,SAAS,IAAI,QAAQ,CAAC,MAAM,QAAQ,UAAU,wBAAwB,QAAQ,CAAC,IAAI,GAAG,EAAE,MAAM,EAAE,2DAA2D,EAAE,CAAC,CAAC;YACvhB,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;gBAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,SAAS,IAAI,QAAQ,CAAC,MAAM,6CAA6C,EAAE,MAAM,EAAE,gEAAgE,EAAE,CAAC,CAAC;YACzgB,IAAI,QAAQ,CAAC,MAAM,KAAK,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,KAAK,IAAI,IAAI,MAAM,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;gBACpJ,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,wBAAwB,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,EAAE,UAAU,SAAS,SAAS,MAAM,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,oBAAoB,QAAQ,CAAC,MAAM,kBAAkB,EAAE,MAAM,EAAE,wFAAwF,EAAE,CAAC,CAAC;YACvgB,CAAC;QACH,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,CAAC;YAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;gBAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,SAAS,aAAa,MAAM,+CAA+C,EAAE,MAAM,EAAE,yEAAyE,EAAE,CAAC,CAAC;QACnf,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;YAAE,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;gBAClD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;gBAC1J,IAAI,CAAC,KAAK;oBAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,wBAAwB,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,QAAQ,IAAI,KAAK,+BAA+B,SAAS,IAAI,MAAM,8BAA8B,EAAE,MAAM,EAAE,wFAAwF,EAAE,CAAC,CAAC;YAC5d,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;YAAE,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACzF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC9C,MAAM,aAAa,GAAG,MAAM,EAAE,SAAS,IAAI,QAAQ,CAAC,MAAM,CAAC;gBAC3D,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,gBAAgB,IAAI,UAAU,CAAC,eAAe,KAAK,aAAa,CAAC,CAAC;gBACnM,IAAI,CAAC,UAAU;oBAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,UAAU,EAAE,wBAAwB,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,gBAAgB,EAAE,OAAO,EAAE,aAAa,QAAQ,IAAI,QAAQ,CAAC,UAAU,gDAAgD,aAAa,IAAI,EAAE,MAAM,EAAE,qIAAqI,EAAE,CAAC,CAAC;qBAC9jB,IAAI,CAAC,UAAU,CAAC,SAAS;oBAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,UAAU,EAAE,2BAA2B,CAAC,EAAE,IAAI,EAAE,2BAA2B,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,UAAU,CAAC,IAAI,+CAA+C,EAAE,MAAM,EAAE,2EAA2E,EAAE,CAAC,CAAC;YAC1gB,CAAC;QACD,IAAI,QAAQ,CAAC,SAAS,KAAK,aAAa,IAAI,KAAK,CAAC,iBAAiB,KAAK,KAAK;YAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,qBAAqB,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,SAAS,qEAAqE,EAAE,MAAM,EAAE,yGAAyG,EAAE,CAAC,CAAC;QACzgB,IAAI,KAAK,CAAC,gBAAgB,KAAK,IAAI,IAAI,KAAK,CAAC,qBAAqB,KAAK,IAAI;YAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,SAAS,0DAA0D,EAAE,MAAM,EAAE,0FAA0F,EAAE,CAAC,CAAC;IACld,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,MAAkB,EAAE,QAAiC,EAAE,SAAsD;IACrJ,IAAI,CAAC,QAAQ;QAAE,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,SAAS,sBAAsB,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,EAAE,OAAO,EAAE,kDAAkD,EAAE,MAAM,EAAE,kGAAkG,EAAE,CAAC,CAAC;IACnX,OAAO,gBAAgB,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AACvD,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,uBAAuB,CACrC,OAA0B,EAC1B,QAA2B,EAC3B,WAAmB,EACnB,mBAAsI,EAAE;IAExI,OAAO;QACL,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAqB,EAAE,CAAC,CAAC;YAC1D,EAAE,EAAE,EAAE,CAAC,kBAAkB,EAAE,SAAS,UAAU,CAAC,SAAS,EAAE,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,UAAU,CAAC,SAAS,EAAE;YACtI,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,CAAC,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,kBAAkB;YAChI,KAAK,EAAE,UAAU,CAAC,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK;YAC/I,OAAO,EAAE,UAAU,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,KAAK,QAAQ,UAAU,CAAC,MAAM,OAAO,WAAW,GAAG;YACrG,MAAM,EAAE,mFAAmF;SAC5F,CAAC,CAAC;QACH,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAqB,EAAE,CAAC,CAAC;YAC5C,EAAE,EAAE,EAAE,CAAC,kBAAkB,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS;YACzH,SAAS,EAAE,kBAAkB,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK;YAC3E,OAAO,EAAE,UAAU,KAAK,yDAAyD,WAAW,GAAG;YAC/F,MAAM,EAAE,2FAA2F;SACpG,CAAC,CAAC;QACH,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAqB,EAAE,CAAC,CAAC;YAC7C,EAAE,EAAE,EAAE,CAAC,kBAAkB,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,OAAO;YACzH,SAAS,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK;YACxE,OAAO,EAAE,UAAU,KAAK,oDAAoD,WAAW,GAAG;YAC1F,MAAM,EAAE,oFAAoF;SAC7F,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED,6FAA6F;AAC7F,MAAM,UAAU,2BAA2B,CAAC,QAAwC;IAClF,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAwB,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,CAAC,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAU,CAAC;IAC7F,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACzD,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,MAAM,KAAK,WAAW,CAAC,CAAC;QACnG,MAAM,uBAAuB,GAAG,IAAI,CAAC,KAAK,KAAK,UAAU,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC5E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC;QACxD,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,uBAAuB,CAAC,CAAC;QACtG,QAAQ,CAAC,IAAI,CAAC;YACZ,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,MAAM,EAAE;YACzN,QAAQ,EAAE,IAAI,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe;YAC5H,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK;YAC5I,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrJ,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,mBAAmB,IAAI,CAAC,KAAK,uCAAuC,QAAQ,CAAC,WAAW,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,IAAI,CAAC,KAAK,qBAAqB,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,mBAAmB,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,MAAM,GAAG;YACvS,MAAM,EAAE,uBAAuB,CAAC,CAAC,CAAC,wFAAwF,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YACxI,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;SACvF,CAAC,CAAC;IACL,CAAC;IACD,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAC;QACxD,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;YACxE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvB,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC;QACD,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,gBAAgB;YAAE,IAAI,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtG,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,uBAAuB,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,kBAAkB,QAAQ,4DAA4D,EAAE,MAAM,EAAE,0HAA0H,EAAE,CAAC,CAAC;YAChlB,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/schema/deployment/reconcile.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abloatai/transaction",
3
- "version": "0.59.0",
3
+ "version": "0.59.1",
4
4
  "description": "The headless Ablo transaction client and canonical contracts for reads, commits, confirmation, claims, and durable observation.",
5
5
  "license": "Apache-2.0",
6
6
  "type": "module",
package/src/schema/deployment/index.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { DeploymentApplyResult, DeploymentObservation, DeploymentStep, SchemaDeploymentPlan } from './contracts.js';
1
+ import type { DeploymentApplyResult, DeploymentFinding, DeploymentObservation, DeploymentStep, SchemaDeploymentPlan } from './contracts.js';
2
2
  import { deploymentFingerprint } from './fingerprint.js';
3
3
  import { reconcileDeploymentManifest, reconcilePolicyIntent, reconcileSchemaToDatabase, reconcileSourceToActiveResult } from './reconcile.js';
4
4
  import { sequenceDeployment } from './sequence.js';
@@ -10,6 +10,27 @@ export { sequenceDeployment } from './sequence.js';
10
10
  export * from './backfill.js';
11
11
  export * from './postgresCatalog.js';
12
12
 
13
+ function physicalEvidenceKey(finding: DeploymentFinding): string {
14
+ return JSON.stringify([
15
+ finding.code,
16
+ finding.category,
17
+ finding.severity,
18
+ finding.phase,
19
+ finding.owner,
20
+ finding.model,
21
+ finding.field,
22
+ finding.column,
23
+ finding.from,
24
+ finding.to,
25
+ finding.message,
26
+ finding.action,
27
+ ]);
28
+ }
29
+
30
+ function physicalResourceKey(finding: DeploymentFinding): string {
31
+ return JSON.stringify([finding.model, finding.column, finding.field]);
32
+ }
33
+
13
34
  function planStates(observation: DeploymentObservation): SchemaDeploymentPlan['states'] {
14
35
  const { schema: _sourceSchema, ...source } = observation.source;
15
36
  const active = observation.active ? (({ schema: _activeSchema, ...state }) => state)(observation.active) : null;
@@ -24,14 +45,44 @@ export function buildSchemaDeploymentPlan(observation: DeploymentObservation, no
24
45
  observation.source.schema,
25
46
  observation.intent?.renames,
26
47
  observation.intent?.backfills,
48
+ observation.database,
27
49
  );
28
50
  const provision = reconcileSourceToActiveResult(null, observation.source.schema).operations;
51
+ const sourceToDatabase = reconcileSchemaToDatabase(observation.source.schema, observation.database, 'source_to_database');
52
+ const sourcePhysicalEvidence = new Set(sourceToDatabase.map(physicalEvidenceKey));
53
+ const sourcePhysicalResources = new Set(sourceToDatabase.map(physicalResourceKey));
54
+ const activeDatabaseFindings = observation.active
55
+ ? reconcileSchemaToDatabase(observation.active.schema, observation.database, 'active_to_database')
56
+ : [];
57
+ const candidateAlignedActiveFindings: DeploymentFinding[] = [];
58
+ const activeToDatabase = activeDatabaseFindings.filter((finding) => {
59
+ if (sourcePhysicalEvidence.has(physicalEvidenceKey(finding))) return false;
60
+ if (!sourcePhysicalResources.has(physicalResourceKey(finding))) {
61
+ candidateAlignedActiveFindings.push(finding);
62
+ return false;
63
+ }
64
+ return true;
65
+ });
66
+ const candidateAlignmentEvidence: DeploymentFinding[] = candidateAlignedActiveFindings.length === 0 ? [] : [{
67
+ id: 'active_to_database:candidate_alignment_verified',
68
+ code: 'candidate_alignment_verified',
69
+ category: 'observation',
70
+ severity: 'info',
71
+ direction: 'active_to_database',
72
+ phase: 'verify',
73
+ owner: observation.database?.ownership === 'ablo' ? 'ablo' : 'application_migration',
74
+ from: { activePhysicalDifferences: candidateAlignedActiveFindings.length },
75
+ to: 'source_database_alignment',
76
+ message: `PostgreSQL differs from the active artifact at ${candidateAlignedActiveFindings.length} physical contract location(s), and the candidate source already matches those locations.`,
77
+ action: 'Treat these differences as completed expand work; review the remaining source-to-active compatibility findings before activation.',
78
+ }];
29
79
  const findings = [
30
80
  ...reconcilePolicyIntent(observation.source.schema),
31
81
  ...reconcileDeploymentManifest(observation.intent?.manifest),
32
82
  ...sourceToActive.findings,
33
- ...reconcileSchemaToDatabase(observation.source.schema, observation.database, 'source_to_database'),
34
- ...(observation.active ? reconcileSchemaToDatabase(observation.active.schema, observation.database, 'active_to_database') : []),
83
+ ...sourceToDatabase,
84
+ ...activeToDatabase,
85
+ ...candidateAlignmentEvidence,
35
86
  ...(observation.supplementalFindings ?? []),
36
87
  ];
37
88
  const unique = [...new Map(findings.map((finding) => [finding.id, finding])).values()].map((finding) =>
package/src/schema/deployment/reconcile.ts CHANGED
@@ -49,15 +49,89 @@ function stepFinding(step: MigrationStep): DeploymentFinding | null {
49
49
  };
50
50
  }
51
51
 
52
- export function reconcileSourceToActive(active: SchemaJSON | null, source: SchemaJSON, hints: RenameHints = {}, backfills: readonly BackfillValue[] = []): readonly DeploymentFinding[] {
53
- return reconcileSourceToActiveResult(active, source, hints, backfills).findings;
52
+ function databaseSatisfiesRequiredField(
53
+ signal: MigrationSignal,
54
+ source: SchemaJSON,
55
+ database: DatabaseSnapshot | null,
56
+ ): boolean {
57
+ if (!database || (signal.code !== 'required_field_added' && signal.code !== 'made_required') || !signal.field) return false;
58
+ const model = source.models[signal.model];
59
+ const field = model?.fields[signal.field];
60
+ if (!model || !field || field.isOptional) return false;
61
+ const table = database.tables[model.tableName ?? signal.model];
62
+ const column = table?.columns[field.column ?? camelToSnake(signal.field)];
63
+ return column !== undefined &&
64
+ !column.nullable &&
65
+ (column.nullCount === undefined || column.nullCount === null || column.nullCount === 0) &&
66
+ normalizePgType(column.dataType) === sqlType(field.type);
54
67
  }
55
68
 
56
- export function reconcileSourceToActiveResult(active: SchemaJSON | null, source: SchemaJSON, hints: RenameHints = {}, backfills: readonly BackfillValue[] = []): { operations: readonly MigrationStep[]; findings: readonly DeploymentFinding[] } {
69
+ function databaseSatisfiesRiskyCast(
70
+ signal: MigrationSignal,
71
+ source: SchemaJSON,
72
+ database: DatabaseSnapshot | null,
73
+ ): boolean {
74
+ if (!database || signal.code !== 'risky_cast' || !signal.field) return false;
75
+ const model = source.models[signal.model];
76
+ const field = model?.fields[signal.field];
77
+ // A TEXT column does not prove that existing rows satisfy a newly narrowed
78
+ // enum CHECK constraint; the catalog snapshot currently observes type only.
79
+ if (!model || !field || field.type === 'enum') return false;
80
+ const table = database.tables[model.tableName ?? signal.model];
81
+ const column = table?.columns[field.column ?? camelToSnake(signal.field)];
82
+ return column !== undefined && normalizePgType(column.dataType) === sqlType(field.type);
83
+ }
84
+
85
+ function databasePreservesRemovedApplicationModel(
86
+ signal: MigrationSignal,
87
+ active: SchemaJSON | null,
88
+ source: SchemaJSON,
89
+ database: DatabaseSnapshot | null,
90
+ ): boolean {
91
+ if (!active || !database || database.ownership !== 'application' || signal.code !== 'drop_model') return false;
92
+ if (source.models[signal.model]) return false;
93
+ const activeModel = active.models[signal.model];
94
+ return activeModel !== undefined && database.tables[activeModel.tableName ?? signal.model] !== undefined;
95
+ }
96
+
97
+ export function reconcileSourceToActive(
98
+ active: SchemaJSON | null,
99
+ source: SchemaJSON,
100
+ hints: RenameHints = {},
101
+ backfills: readonly BackfillValue[] = [],
102
+ database: DatabaseSnapshot | null = null,
103
+ ): readonly DeploymentFinding[] {
104
+ return reconcileSourceToActiveResult(active, source, hints, backfills, database).findings;
105
+ }
106
+
107
+ export function reconcileSourceToActiveResult(
108
+ active: SchemaJSON | null,
109
+ source: SchemaJSON,
110
+ hints: RenameHints = {},
111
+ backfills: readonly BackfillValue[] = [],
112
+ database: DatabaseSnapshot | null = null,
113
+ ): { operations: readonly MigrationStep[]; findings: readonly DeploymentFinding[] } {
57
114
  const steps = diffSchema(active, source, hints);
58
115
  const classification = classifyMigration(steps);
59
- const signals = [...unresolvedBlockers(classification, backfills), ...classification.warnings].map((signal) => signalFinding(signal, 'source_to_active'));
60
- const signalLocations = new Set(signals.map(({ model, field }) => `${model}:${field ?? ''}`));
116
+ const blockers = unresolvedBlockers(classification, backfills);
117
+ const requiredFieldsVerified = blockers.filter((signal) => databaseSatisfiesRequiredField(signal, source, database));
118
+ const typeCorrectionsVerified = classification.warnings.filter((signal) => databaseSatisfiesRiskyCast(signal, source, database));
119
+ const removedApplicationModelsPreserved = classification.warnings.filter((signal) =>
120
+ databasePreservesRemovedApplicationModel(signal, active, source, database)
121
+ );
122
+ const databaseVerified = new Set<MigrationSignal>([
123
+ ...requiredFieldsVerified,
124
+ ...typeCorrectionsVerified,
125
+ ...removedApplicationModelsPreserved,
126
+ ]);
127
+ const signals = [
128
+ ...blockers.filter((signal) => !databaseVerified.has(signal)),
129
+ ...classification.warnings.filter((signal) => !databaseVerified.has(signal)),
130
+ ].map((signal) => signalFinding(signal, 'source_to_active'));
131
+ // Keep every classified location out of the ordinary step findings, including
132
+ // blockers discharged by observed PostgreSQL evidence. Otherwise a verified
133
+ // required field falls through and is emitted again as an add_field blocker.
134
+ const signalLocations = new Set([...blockers, ...classification.warnings].map(({ model, field }) => `${model}:${field ?? ''}`));
61
135
  const ordinary = steps
62
136
  .map(stepFinding)
63
137
  .filter((finding): finding is DeploymentFinding => finding !== null)
@@ -74,7 +148,49 @@ export function reconcileSourceToActiveResult(active: SchemaJSON | null, source:
74
148
  }
75
149
  : finding;
76
150
  });
77
- return { operations: steps, findings: [...signals, ...ordinary] };
151
+ const requiredFieldEvidence: DeploymentFinding[] = requiredFieldsVerified.length === 0 ? [] : [{
152
+ id: 'source_to_active:database_migration_verified',
153
+ code: 'database_migration_verified',
154
+ category: 'data_movement',
155
+ severity: 'info',
156
+ direction: 'source_to_active',
157
+ phase: 'verify',
158
+ owner: database?.ownership === 'ablo' ? 'ablo' : 'application_migration',
159
+ from: { requiredChanges: requiredFieldsVerified.length },
160
+ to: 'satisfied',
161
+ message: `PostgreSQL already enforces ${requiredFieldsVerified.length} required field migration(s) absent from the active artifact.`,
162
+ action: 'No synthetic backfill declaration is needed; preserve the matching non-null columns and activate the reviewed schema.',
163
+ }];
164
+ const typeCorrectionEvidence: DeploymentFinding[] = typeCorrectionsVerified.length === 0 ? [] : [{
165
+ id: 'source_to_active:database_type_correction_verified',
166
+ code: 'database_type_correction_verified',
167
+ category: 'destructive_contract',
168
+ severity: 'info',
169
+ direction: 'source_to_active',
170
+ phase: 'verify',
171
+ owner: database?.ownership === 'ablo' ? 'ablo' : 'application_migration',
172
+ from: { typeCorrections: typeCorrectionsVerified.length },
173
+ to: 'source_database_alignment',
174
+ message: `PostgreSQL already matches ${typeCorrectionsVerified.length} candidate field type correction(s) that differ from the active artifact.`,
175
+ action: 'No physical cast is needed; activate the reviewed schema and use forward recovery because the prior artifact no longer matches PostgreSQL.',
176
+ }];
177
+ const removedModelEvidence: DeploymentFinding[] = removedApplicationModelsPreserved.length === 0 ? [] : [{
178
+ id: 'source_to_active:application_model_removal_verified',
179
+ code: 'application_model_removal_verified',
180
+ category: 'compatibility',
181
+ severity: 'warning',
182
+ direction: 'source_to_active',
183
+ phase: 'verify',
184
+ owner: 'application',
185
+ from: { removedModels: removedApplicationModelsPreserved.length },
186
+ to: 'physical_tables_preserved',
187
+ message: `${removedApplicationModelsPreserved.length} model removal(s) only change the served schema; their application-owned PostgreSQL tables remain present.`,
188
+ action: 'Verify no supported client still reads these models, then activate; Ablo will not drop the preserved application tables.',
189
+ }];
190
+ return {
191
+ operations: steps,
192
+ findings: [...signals, ...requiredFieldEvidence, ...typeCorrectionEvidence, ...removedModelEvidence, ...ordinary],
193
+ };
78
194
  }
79
195
 
80
196
  export function reconcilePolicyIntent(source: SchemaJSON): readonly DeploymentFinding[] {