open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2026-09-20 16:07:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(ql3): rehearse cross-domain reconciliation completion

Browse Source
This commit is contained in:
whyour
2026-09-02 02:37:39 +08:00
parent 37801d2f30
commit a95ed67fe8
20 changed files with 1030 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/ql3-alpha-stage-index.cjs
+1 -1
View File
@@ -240,7 +240,7 @@ function validateMilestoneRecord(record, product, sourceRevision, variant) {
: 'cluster_integration_candidate_not_public_release';
const expectedSchema =
product === 'local'
? 'qinglong/alpha-local-milestone@v6'
? 'qinglong/alpha-local-milestone@v7'
: 'qinglong/alpha-cluster-milestone@v1';
if (
!exactKeys(record, ['artifactName', 'schema', 'maturity', 'manifest']) ||
scripts/ql3-local-alpha-milestone.cjs
+4 -4
View File
@@ -12,7 +12,7 @@ const {
const { readReleaseIdentity } = require('./lib/ql3-release-identity.cjs');
const DEFAULT_ROOT = path.resolve(__dirname, '..');
const SCHEMA = 'qinglong/alpha-local-milestone@v6';
const SCHEMA = 'qinglong/alpha-local-milestone@v7';
const ARCHITECTURES = Object.freeze(['amd64', 'arm64']);
const FILES = Object.freeze({
readme: 'README.md',
@@ -326,7 +326,7 @@ function auditLocalAlphaMilestone(options) {
'artifacts',
'readme',
]) ||
manifest.schemaVersion !== 6 ||
manifest.schemaVersion !== 7 ||
manifest.schema !== SCHEMA ||
manifest.maturity !== 'alpha_candidate_not_public_release' ||
manifest.product !== 'local' ||
@@ -405,7 +405,7 @@ function auditLocalAlphaMilestone(options) {
}
return Object.freeze({
schemaVersion: 1,
schema: 'qinglong/alpha-local-milestone-audit@v6',
schema: 'qinglong/alpha-local-milestone-audit@v7',
sourceRevision: manifest.sourceRevision,
version: manifest.version,
variant: manifest.variant,
@@ -463,7 +463,7 @@ function finalizeLocalAlphaMilestone(options) {
path.join(normalized.outputRoot, FILES.readme),
);
const manifest = {
schemaVersion: 6,
schemaVersion: 7,
schema: SCHEMA,
maturity: 'alpha_candidate_not_public_release',
product: 'local',
scripts/ql3-local-alpha-reconciliation-decision-fixture.cjs
+228 -5
View File
@@ -187,6 +187,19 @@ function diagnosticFacts(root, summary) {
return facts;
}
function readNdjson(filePath, maximumBytes, label) {
const resolved = canonicalFile(filePath, maximumBytes, label);
try {
return fs
.readFileSync(resolved, 'utf8')
.trimEnd()
.split('\n')
.map((line) => JSON.parse(line));
} catch {
return fail(`${label} must be canonical NDJSON`);
}
}
function reviewFixture(root, output) {
const summary = validateSummary(root, 'operator_decision_required');
if (
@@ -259,6 +272,101 @@ function reviewFixture(root, output) {
});
}
function completionReviewFixture(root, output) {
const summary = validateSummary(root, 'operator_decision_required');
if (
!UUID_V4.test(summary.review?.reviewId || '') ||
!DIGEST.test(summary.plan?.planDigest || '') ||
!DIGEST.test(summary.review?.preparationDigest || '')
) {
fail('completion review fixture identity is invalid');
}
const facts = diagnosticFacts(root, summary);
let adoptedAutomationTables = 0;
let legacyRunHistoryFacts = 0;
let targetRunHistoryFacts = 0;
let secretConfigFacts = 0;
const decisions = [];
for (const fact of facts) {
if (fact.decisionRequirement === 'informational') continue;
if (fact.decisionRequirement === 'blocked') {
fail('completion review fixture refuses blocked diagnostic facts');
}
const automationTable =
fact.database === 'legacy' &&
fact.domain === 'automation' &&
fact.factKind === 'table' &&
fact.tableName === 'Crontabs' &&
fact.decisionRequirement === 'required';
const runHistory = fact.domain === 'run_history';
const secretConfig = fact.domain === 'secret_and_config';
if (automationTable) adoptedAutomationTables += 1;
if (runHistory && fact.database === 'legacy') legacyRunHistoryFacts += 1;
if (runHistory && fact.database === 'target') targetRunHistoryFacts += 1;
if (secretConfig) secretConfigFacts += 1;
const legacy = fact.database === 'legacy';
decisions.push({
schemaVersion: 1,
kind: 'qinglong3-local-reconciliation-review-decision',
database: fact.database,
domain: fact.domain,
factKind: fact.factKind,
ordinal: fact.ordinal,
factDigest: fact.factDigest,
disposition: automationTable
? 'adopt_legacy'
: secretConfig
? 'manual_external'
: runHistory && legacy
? 'retain_both'
: legacy
? 'exclude_legacy'
: 'retain_target',
reason: automationTable
? 'prefer_legacy'
: secretConfig
? 'external_recovery_required'
: runHistory && legacy
? 'preserve_both'
: legacy
? 'legacy_excluded'
: 'preserve_target',
});
}
if (
adoptedAutomationTables !== 1 ||
legacyRunHistoryFacts < 1 ||
targetRunHistoryFacts < 1 ||
secretConfigFacts < 1
) {
fail(
'completion fixture requires Automation, Secret/Config, and dual Run History authority',
);
}
const records = [
{
schemaVersion: 1,
kind: 'qinglong3-local-reconciliation-review-decision-header',
diagnosticsContractVersion: 1,
reviewId: summary.review.reviewId,
profile: summary.profile,
planDigest: summary.plan.planDigest,
preparationDigest: summary.review.preparationDigest,
},
...decisions,
];
const filePath = writeExclusive(output, records);
return Object.freeze({
mode: 'completion-review',
filePath,
decisionCount: decisions.length,
adoptedAutomationTables,
legacyRunHistoryFacts,
targetRunHistoryFacts,
secretConfigFacts,
});
}
function automationFixture(root, output) {
const summary = validateSummary(root, 'automation_decision_required');
const automation = summary.automation;
@@ -351,6 +459,111 @@ function automationFixture(root, output) {
});
}
function secretConfigFixture(root, output) {
const summary = validateSummary(root, 'secret_config_decision_required');
const secretConfig = summary.secretConfig;
const decision = summary.secretConfigDecision;
if (
!UUID_V4.test(secretConfig?.secretConfigId || '') ||
!UUID_V7.test(decision?.decisionId || '') ||
!DIGEST.test(secretConfig?.secretConfigPlanDigest || '') ||
!DIGEST.test(decision?.preparationDigest || '') ||
!Number.isSafeInteger(secretConfig?.eligibleBindingCount) ||
!Number.isSafeInteger(secretConfig?.eligiblePreservationCount) ||
secretConfig.eligibleBindingCount + secretConfig.eligiblePreservationCount <
1 ||
secretConfig.targetConflictCount !== 0 ||
secretConfig.unadaptedLegacyConfigCount !== 0
) {
fail('fixture requires one ready conflict-free Secret/Config plan');
}
const directory = path.join(
root,
'secret-config',
secretConfig.secretConfigId,
);
const receipt = readJson(
path.join(directory, 'receipt.json'),
'Secret/Config plan receipt',
);
if (
receipt?.schemaVersion !== 1 ||
receipt?.schema !==
'qinglong3-local-reconciliation-secret-config-plan-receipt' ||
receipt?.state !== 'reconciliation_secret_config_planned' ||
receipt?.secretConfigId !== secretConfig.secretConfigId ||
receipt?.secretConfigPlanDigest !== secretConfig.secretConfigPlanDigest ||
receipt?.outcome !== 'ready' ||
receipt?.eligibleBindingCount !== secretConfig.eligibleBindingCount ||
receipt?.eligiblePreservationCount !==
secretConfig.eligiblePreservationCount ||
receipt?.targetConflictCount !== 0 ||
receipt?.unadaptedLegacyConfigCount !== 0
) {
fail('Secret/Config plan receipt is not fixture-eligible');
}
const records = readNdjson(
path.join(directory, 'plan.ndjson'),
8 * 1024 * 1024,
'Secret/Config row plan',
);
const candidates = records.filter(
(record) =>
record?.kind ===
'qinglong3-local-reconciliation-secret-config-plan-candidate',
);
if (
candidates.length !==
secretConfig.eligibleBindingCount + secretConfig.eligiblePreservationCount
) {
fail('Secret/Config row plan candidate count is incompatible');
}
const decisions = candidates.map((candidate) => {
if (
candidate?.schemaVersion !== 1 ||
!Number.isSafeInteger(candidate.candidateOrdinal) ||
candidate.candidateOrdinal < 1 ||
!DIGEST.test(candidate.candidateDigest || '') ||
!['review_apply_binding', 'review_preserve_disabled'].includes(
candidate.requirement,
) ||
candidate.target?.state !== 'absent'
) {
fail('Secret/Config row plan contains a conflicting candidate');
}
const active = candidate.requirement === 'review_apply_binding';
return {
schemaVersion: 1,
kind: 'qinglong3-local-reconciliation-secret-config-decision',
candidateOrdinal: candidate.candidateOrdinal,
candidateDigest: candidate.candidateDigest,
disposition: active ? 'apply_active_binding' : 'preserve_disabled',
reason: active
? 'reviewed_active_binding'
: 'reviewed_disabled_preservation',
};
});
const outputRecords = [
{
schemaVersion: 1,
kind: 'qinglong3-local-reconciliation-secret-config-decision-header',
decisionContractVersion: 1,
decisionId: decision.decisionId,
profile: summary.profile,
secretConfigPlanDigest: secretConfig.secretConfigPlanDigest,
preparationDigest: decision.preparationDigest,
},
...decisions,
];
const filePath = writeExclusive(output, outputRecords);
return Object.freeze({
mode: 'secret-config',
filePath,
decisionCount: decisions.length,
secretConfigPlanDigest: secretConfig.secretConfigPlanDigest,
});
}
function parseArguments(argv) {
const values = {};
for (const argument of argv) {
@@ -360,7 +573,9 @@ function parseArguments(argv) {
values[match[1]] = match[2];
}
if (
!['review', 'automation'].includes(values.mode) ||
!['review', 'completion-review', 'automation', 'secret-config'].includes(
values.mode,
) ||
JSON.stringify(Object.keys(values).sort()) !==
JSON.stringify(['mode', 'output', 'reconciliation-root'])
) {
@@ -375,10 +590,16 @@ function parseArguments(argv) {
function runCli(argv) {
const options = parseArguments(argv);
const report =
options.mode === 'review'
? reviewFixture(options.reconciliationRoot, options.output)
: automationFixture(options.reconciliationRoot, options.output);
const fixtures = {
review: reviewFixture,
'completion-review': completionReviewFixture,
automation: automationFixture,
'secret-config': secretConfigFixture,
};
const report = fixtures[options.mode](
options.reconciliationRoot,
options.output,
);
process.stdout.write(`${JSON.stringify(report)}\n`);
return report;
}
@@ -396,8 +617,10 @@ if (require.main === module) {
module.exports = Object.freeze({
automationFixture,
completionReviewFixture,
diagnosticFacts,
parseArguments,
reviewFixture,
runCli,
secretConfigFixture,
});
scripts/ql3-local-alpha-trial-kit-bundle.cjs
+7 -6
View File
@@ -10,8 +10,8 @@ const { auditClusterImageSbom } = require('./ql3-cluster-image-sbom.cjs');
const { readReleaseIdentity } = require('./lib/ql3-release-identity.cjs');
const DEFAULT_ROOT = path.resolve(__dirname, '..');
const SCHEMA = 'qinglong/alpha-local-trial-kit@v10';
const VERIFICATION_SCHEMA = 'qinglong/alpha-local-trial-kit-verification@v8';
const SCHEMA = 'qinglong/alpha-local-trial-kit@v11';
const VERIFICATION_SCHEMA = 'qinglong/alpha-local-trial-kit-verification@v9';
const QUICKSTART_TEMPLATE = path.join(
DEFAULT_ROOT,
'scripts/templates/ql3-local-alpha-quickstart.sh',
@@ -73,6 +73,7 @@ const VERIFICATION = Object.freeze({
legacyUpgradeCutover: 'passed',
legacyUpgradeReconciliationCapture: 'passed',
legacyUpgradeReconciliationAutomationRollback: 'passed',
legacyUpgradeReconciliationCompletion: 'passed',
});
function verificationGates(variant) {
@@ -782,7 +783,7 @@ function createLocalAlphaTrialKit(options, adapters = {}) {
0o700,
);
const manifest = {
schemaVersion: 11,
schemaVersion: 12,
schema: SCHEMA,
maturity: 'alpha_candidate_not_public_release',
product: 'local',
@@ -909,7 +910,7 @@ function auditLocalAlphaTrialKit(options) {
'readme',
'verification',
]) ||
manifest.schemaVersion !== 11 ||
manifest.schemaVersion !== 12 ||
manifest.schema !== SCHEMA ||
manifest.maturity !== 'alpha_candidate_not_public_release' ||
manifest.product !== 'local' ||
@@ -1030,7 +1031,7 @@ function auditLocalAlphaTrialKit(options) {
expectedUpgradeReconciliationRehearsal
) {
fail(
'upgrade reconciliation rehearsal differs from the canonical reviewed application and rollback journey',
'upgrade reconciliation rehearsal differs from the canonical reviewed rollback and completion journey',
);
}
validateFileRecord(manifest.readme, FILES.readme, bundleRoot);
@@ -1110,7 +1111,7 @@ function auditLocalAlphaTrialKit(options) {
}
return Object.freeze({
schemaVersion: 1,
schema: 'qinglong/alpha-local-trial-kit-audit@v7',
schema: 'qinglong/alpha-local-trial-kit-audit@v8',
sourceRevision: manifest.sourceRevision,
version: manifest.version,
architecture: manifest.architecture,
scripts/ql3-local-alpha-upgrade-readiness-fixture.cjs
+39 -10
View File
@@ -13,14 +13,32 @@ function fail(message) {
}
function parseArguments(argv) {
if (argv.length !== 1) fail('usage: --output=/absolute/new/data-root');
const match = /^--output=(\/.+)$/u.exec(argv[0]);
const values = {};
for (const argument of argv) {
const match = /^--([a-z-]+)=(.+)$/u.exec(argument);
if (!match || Object.hasOwn(values, match[1])) {
fail(
'usage: --output=/absolute/new/data-root [--shape=production|completion-ready]',
);
}
values[match[1]] = match[2];
}
if (
!values.output ||
Object.keys(values).some((key) => !['output', 'shape'].includes(key)) ||
(values.shape && !['production', 'completion-ready'].includes(values.shape))
) {
fail(
'usage: --output=/absolute/new/data-root [--shape=production|completion-ready]',
);
}
const match = /^(\/.+)$/u.exec(values.output);
if (!match) fail('output must be an absolute path');
const output = path.resolve(match[1]);
if (output !== match[1] || path.parse(output).root === output) {
fail('output must be a normalized absolute non-root path');
}
return output;
return Object.freeze({ output, shape: values.shape || 'production' });
}
function writePrivate(filePath, contents) {
@@ -31,7 +49,7 @@ function writePrivate(filePath, contents) {
});
}
function createLegacyDatabase(databasePath) {
function createLegacyDatabase(databasePath, shape) {
const database = new DatabaseSync(databasePath);
try {
database.exec(`
@@ -94,7 +112,6 @@ function createLegacyDatabase(databasePath) {
status DECIMAL NOT NULL, exit_code DECIMAL,
createdAt DATETIME NOT NULL, updatedAt DATETIME NOT NULL
);
CREATE TABLE "PluginOwnedState" (id INTEGER PRIMARY KEY, payload TEXT NOT NULL);
INSERT INTO "Crontabs" (
id, name, command, schedule, status, isDisabled, isPinned, createdAt, updatedAt
) VALUES (
@@ -107,22 +124,32 @@ function createLegacyDatabase(databasePath) {
1, 'ALPHA_READINESS_VALUE', 'synthetic-only', 0, 100,
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
);
INSERT INTO "PluginOwnedState" (id, payload)
VALUES (1, '{"synthetic":true}');
`);
if (shape === 'production') {
database.exec(`
CREATE TABLE "PluginOwnedState" (
id INTEGER PRIMARY KEY, payload TEXT NOT NULL
);
INSERT INTO "PluginOwnedState" (id, payload)
VALUES (1, '{"synthetic":true}');
`);
}
} finally {
database.close();
}
fs.chmodSync(databasePath, 0o600);
}
function createFixture(output) {
function createFixture(output, shape = 'production') {
if (!['production', 'completion-ready'].includes(shape)) {
fail('fixture shape is invalid');
}
if (fs.existsSync(output)) fail('output must not already exist');
fs.mkdirSync(output, { mode: 0o700 });
for (const directory of ['config', 'scripts', 'db', 'upload', 'ssh.d']) {
fs.mkdirSync(path.join(output, directory), { mode: 0o700 });
}
createLegacyDatabase(path.join(output, 'db', 'database.sqlite'));
createLegacyDatabase(path.join(output, 'db', 'database.sqlite'), shape);
writePrivate(
path.join(output, 'config', 'config.sh'),
"export ALPHA_READINESS_CONFIG='synthetic-only'\n",
@@ -138,11 +165,13 @@ function createFixture(output) {
return Object.freeze({
output,
database: path.join(output, 'db', 'database.sqlite'),
shape,
});
}
function runCli(argv) {
const result = createFixture(parseArguments(argv));
const options = parseArguments(argv);
const result = createFixture(options.output, options.shape);
process.stdout.write(`${JSON.stringify({ status: 'created', ...result })}\n`);
}
scripts/ql3-local-operator-image-audit.cjs
+17
View File
@@ -227,6 +227,18 @@ function auditWorkflow(contents, findings) {
'automation-apply-verify.result.json',
'automation-rollback-verify.result.json',
'"completion":"not_attempted"',
'--shape=completion-ready',
'--mode=completion-review',
'apply-plan edge',
'"status":"secret_config_decision_required"',
'"automaticCandidateDecision":"not_authorized"',
'--mode=secret-config',
'complete edge',
'"status":"reconciliation_completed"',
'"adapterCount":3',
'completion-verify.result.json',
'"targetRestart":"not_authorized"',
'"legacyRestart":"not_authorized"',
'docker rm "${TARGET_CONTAINER}" "${LEGACY_CONTAINER}"',
'--application-sbom="${APPLICATION_SBOM}"',
'--operator-sbom="${RUNNER_TEMP}/ql3-local-operator.cdx.json"',
@@ -260,6 +272,11 @@ function auditWorkflow(contents, findings) {
'--mode=review',
'--mode=automation',
'apply-rollback edge',
'--shape=completion-ready',
'--mode=completion-review',
'apply-plan edge',
'--mode=secret-config',
'complete edge',
'name: Upload the tested native Local Alpha trial kit',
]) {
const index = contents.indexOf(value, cursor + 1);
scripts/templates/ql3-local-alpha-reconciliation-rehearsal.sh
+197 -11
View File
@@ -15,6 +15,11 @@ APPLICATION_ID='019f8680-143d-4000-8000-000000000401'
AUTOMATION_ID='019f8680-143d-4000-8000-000000000461'
AUTOMATION_DECISION_ID='019f8680-143d-7000-8000-000000000471'
AUTOMATION_MUTATION_ID='019f8680-143d-4000-8000-000000000481'
SECRET_CONFIG_ID='019f8680-143d-4000-8000-000000000491'
SECRET_CONFIG_DECISION_ID='019f8680-143d-7000-8000-0000000004a1'
SECRET_CONFIG_MUTATION_ID='019f8680-143d-4000-8000-0000000004b1'
RUN_HISTORY_PRESERVATION_ID='019f8680-143d-4000-8000-0000000004c1'
COMPLETION_ID='019f8680-143d-4000-8000-0000000004d1'
fail() {
printf '%s\n' "QingLong Local Alpha reconciliation rehearsal failed: $*" >&2
@@ -29,7 +34,9 @@ usage() {
printf '%s\n' \
'usage: sh reconciliation-rehearsal.sh prepare edge|standalone /absolute/rehearsal-root /absolute/capture-root /absolute/new/reconciliation-root <legacy-timezone|none>' \
' sh reconciliation-rehearsal.sh review edge|standalone /absolute/rehearsal-root /absolute/capture-root /absolute/reconciliation-root /absolute/review-decisions.ndjson' \
' sh reconciliation-rehearsal.sh apply-rollback edge|standalone /absolute/rehearsal-root /absolute/capture-root /absolute/reconciliation-root /absolute/automation-decisions.ndjson /absolute/legacy-root' >&2
' sh reconciliation-rehearsal.sh apply-rollback edge|standalone /absolute/rehearsal-root /absolute/capture-root /absolute/reconciliation-root /absolute/automation-decisions.ndjson /absolute/legacy-root' \
' sh reconciliation-rehearsal.sh apply-plan edge|standalone /absolute/rehearsal-root /absolute/capture-root /absolute/reconciliation-root /absolute/automation-decisions.ndjson /absolute/review-decisions.ndjson /absolute/legacy-root' \
' sh reconciliation-rehearsal.sh complete edge|standalone /absolute/rehearsal-root /absolute/capture-root /absolute/reconciliation-root /absolute/secret-config-decisions.ndjson /absolute/review-decisions.ndjson /absolute/legacy-root' >&2
exit 2
}
@@ -116,17 +123,24 @@ private_decision_file() {
[ "$#" -ge 1 ] || usage
mode=$1
[ "$mode" = apply-rollback ] && [ "$#" -eq 7 ] || {
[ "$mode" != apply-rollback ] && [ "$#" -eq 6 ] || usage
}
case "$mode" in
prepare|review) [ "$#" -eq 6 ] || usage ;;
apply-rollback) [ "$#" -eq 7 ] || usage ;;
apply-plan|complete) [ "$#" -eq 8 ] || usage ;;
*) usage ;;
esac
profile=$2
rehearsal_root=$3
capture_root=$4
reconciliation_root=$5
phase_input=$6
legacy_root=${7:-}
secondary_input=
legacy_root=
case "$mode" in
apply-rollback) legacy_root=$7 ;;
apply-plan|complete) secondary_input=$7; legacy_root=$8 ;;
esac
case "$mode" in prepare|review|apply-rollback) ;; *) usage ;; esac
case "$profile" in edge|standalone) ;; *) usage ;; esac
case "$VARIANT" in headless|console) ;; *) fail 'embedded Trial Kit variant is invalid' ;; esac
[ "$(uname -s)" = Linux ] || fail 'reconciliation rehearsal requires a Linux Docker host'
@@ -163,12 +177,20 @@ application_root="$reconciliation_root/application"
automation_root="$reconciliation_root/automation"
automation_decision_root="$reconciliation_root/automation-decision"
automation_apply_root="$reconciliation_root/automation-apply"
secret_config_root="$reconciliation_root/secret-config"
secret_config_decision_root="$reconciliation_root/secret-config-decision"
secret_config_apply_root="$reconciliation_root/secret-config-apply"
run_history_root="$reconciliation_root/run-history"
completion_root="$reconciliation_root/completion"
command_root="$reconciliation_root/commands"
result_root="$reconciliation_root/results"
target_database="$rehearsal_root/sqlite/qinglong3.sqlite"
issuer_keyring="$rehearsal_root/reconciliation-review-issuer.keyring"
owner_peppers="$rehearsal_root/owner-peppers"
owner_credential="$rehearsal_root/owner-credential.json"
secret_keyring="$rehearsal_root/local-secret-keyring.json"
decision_parent=
secondary_decision_parent=
run_deploy() {
subcommand=$1
@@ -184,8 +206,10 @@ run_deploy() {
--mount "type=bind,src=$reconciliation_root,dst=$reconciliation_root"
[ -z "$legacy_root" ] || set -- "$@" \
--mount "type=bind,src=$legacy_root,dst=$legacy_root,readonly"
[ -z "$input_file" ] || set -- "$@" \
[ -z "$decision_parent" ] || set -- "$@" \
--mount "type=bind,src=$decision_parent,dst=$decision_parent,readonly"
[ -z "$secondary_decision_parent" ] || set -- "$@" \
--mount "type=bind,src=$secondary_decision_parent,dst=$secondary_decision_parent,readonly"
set -- "$@" "$OPERATOR_IMAGE" deploy "$subcommand" \
--command-file "$command_root/$command_file"
result_stage="$result_root/.$result_file.$$"
@@ -213,7 +237,7 @@ if [ "$mode" = prepare ]; then
old_umask=$(umask)
umask 077
mkdir -m 0700 "$reconciliation_root"
for directory in plan review diagnostics application automation automation-decision automation-apply commands results; do
for directory in plan review diagnostics application automation automation-decision automation-apply secret-config secret-config-decision secret-config-apply run-history completion commands results; do
mkdir -m 0700 "$reconciliation_root/$directory"
done
umask "$old_umask"
@@ -299,12 +323,19 @@ EOF
fi
canonical_directory "$reconciliation_root" 'reconciliation root'
for directory in "$plan_root" "$review_root" "$diagnostic_root" "$application_root" "$automation_root" "$automation_decision_root" "$automation_apply_root" "$command_root" "$result_root"; do
for directory in "$plan_root" "$review_root" "$diagnostic_root" "$application_root" "$automation_root" "$automation_decision_root" "$automation_apply_root" "$secret_config_root" "$secret_config_decision_root" "$secret_config_apply_root" "$run_history_root" "$completion_root" "$command_root" "$result_root"; do
canonical_directory "$directory" 'reconciliation authority directory'
done
private_decision_file "$phase_input" 'external decision file'
if [ -n "$secondary_input" ]; then
primary_decision_parent=$decision_parent
private_decision_file "$secondary_input" 'external review decision file'
secondary_decision_parent=$decision_parent
decision_parent=$primary_decision_parent
fi
if [ -n "$legacy_root" ]; then
non_overlapping "$decision_parent" "$legacy_root" || fail 'external decision file parent must be outside legacy root'
[ -z "$secondary_decision_parent" ] || non_overlapping "$secondary_decision_parent" "$legacy_root" || fail 'external review decision file parent must be outside legacy root'
fi
if [ "$mode" = review ]; then
@@ -400,11 +431,101 @@ EOF
'Authenticated review and Automation plan are ready.' \
"Summary: $reconciliation_root/summary.json" \
"Automation plan: $automation_root/$AUTOMATION_ID/plan.ndjson" \
'No Automation row decision was generated or applied. Supply an external owner-private NDJSON decision file to the apply-rollback phase.'
'No Automation row decision was generated or applied. Supply an external owner-private NDJSON decision file to apply-rollback, or pair it with the original review decision for apply-plan.'
exit 0
fi
grep -q '"status":"automation_decision_required"' "$reconciliation_root/summary.json" || fail 'apply-rollback phase is detached from Automation decision state'
if [ "$mode" = complete ]; then
grep -q '"status":"secret_config_decision_required"' "$reconciliation_root/summary.json" || fail 'completion phase is detached from Secret/Config decision state'
application_plan_digest=$(extract_digest "$result_root/application-commit.result.json" applicationPlanDigest)
automation_decision_digest=$(extract_digest "$result_root/automation-decision-commit.result.json" decisionDigest)
automation_apply_digest=$(extract_digest "$result_root/automation-apply.result.json" applyDigest)
preservation_digest=$(extract_digest "$result_root/run-history-preserve.result.json" preservationDigest)
secret_decision_preparation_digest=$(extract_digest "$result_root/secret-config-decision-prepare.result.json" preparationDigest)
secret_decision_head_digest=$(extract_digest "$result_root/secret-config-decision-prepare.result.json" instanceHeadDigest)
if [ -e "$command_root/secret-config-decision-commit.json" ]; then
committed_ms=$(extract_unsigned "$command_root/secret-config-decision-commit.json" committedAtMs)
else
committed_ms=$(($(date +%s) * 1000))
cat >"$command_root/secret-config-decision-commit.json" <<EOF
{"schemaVersion":1,"operation":"local.deployment.reconciliation.secret-config.decision.commit","options":{"deploymentRoot":"$rehearsal_root","applicationRoot":"$application_root","secretConfigRoot":"$secret_config_root","secretConfigDecisionRoot":"$secret_config_decision_root","targetDatabasePath":"$target_database","ownerPepperKeyringDirectory":"$owner_peppers","credentialFilePath":"$owner_credential","busyTimeoutMs":100,"allowRootService":$allow_root_service},"request":{"decisionId":"$SECRET_CONFIG_DECISION_ID","secretConfigId":"$SECRET_CONFIG_ID","expectedPreparationDigest":"$secret_decision_preparation_digest","expectedHeadDigest":"$secret_decision_head_digest","decisionFilePath":"$phase_input","committedAtMs":$committed_ms,"authorizationLifetimeMs":60000}}
EOF
chmod 0600 "$command_root/secret-config-decision-commit.json"
fi
phase 'commit explicit Secret/Config decisions with real Owner authentication'
run_deploy reconciliation-secret-config-decision-commit secret-config-decision-commit.json secret-config-decision-commit.result.json "$phase_input"
grep -q '"state":"reconciliation_secret_config_reviewed"' "$result_root/secret-config-decision-commit.result.json" || fail 'Secret/Config decisions did not commit'
grep -q '"outcome":"ready"' "$result_root/secret-config-decision-commit.result.json" || fail 'Secret/Config decisions did not authorize a ready application'
secret_decision_digest=$(extract_digest "$result_root/secret-config-decision-commit.result.json" decisionDigest)
cat >"$command_root/secret-config-decision-verify.json" <<EOF
{"schemaVersion":1,"operation":"local.deployment.reconciliation.secret-config.decision.verify","options":{"deploymentRoot":"$rehearsal_root","applicationRoot":"$application_root","secretConfigRoot":"$secret_config_root","secretConfigDecisionRoot":"$secret_config_decision_root","allowRootService":$allow_root_service},"request":{"decisionId":"$SECRET_CONFIG_DECISION_ID","secretConfigId":"$SECRET_CONFIG_ID","expectedDecisionDigest":"$secret_decision_digest"}}
EOF
chmod 0600 "$command_root/secret-config-decision-verify.json"
run_deploy reconciliation-secret-config-decision-verify secret-config-decision-verify.json secret-config-decision-verify.result.json
grep -q '"status":"verified"' "$result_root/secret-config-decision-verify.result.json" || fail 'Secret/Config decision verification failed'
secret_decision_head_digest=$(extract_digest "$result_root/secret-config-decision-verify.result.json" instanceHeadDigest)
secret_apply_options="\"deploymentRoot\":\"$rehearsal_root\",\"applicationRoot\":\"$application_root\",\"secretConfigRoot\":\"$secret_config_root\",\"secretConfigDecisionRoot\":\"$secret_config_decision_root\",\"secretConfigApplyRoot\":\"$secret_config_apply_root\",\"targetDatabasePath\":\"$target_database\",\"secretKeyringPath\":\"$secret_keyring\",\"ownerPepperKeyringDirectory\":\"$owner_peppers\",\"credentialFilePath\":\"$owner_credential\",\"busyTimeoutMs\":100,\"allowRootService\":$allow_root_service"
if [ -e "$command_root/secret-config-apply.json" ]; then
applied_ms=$(extract_unsigned "$command_root/secret-config-apply.json" appliedAtMs)
else
applied_ms=$((committed_ms + 1))
cat >"$command_root/secret-config-apply.json" <<EOF
{"schemaVersion":1,"operation":"local.deployment.reconciliation.secret-config.apply","options":{$secret_apply_options},"request":{"decisionId":"$SECRET_CONFIG_DECISION_ID","secretConfigId":"$SECRET_CONFIG_ID","expectedDecisionDigest":"$secret_decision_digest","expectedHeadDigest":"$secret_decision_head_digest","mutationId":"$SECRET_CONFIG_MUTATION_ID","requestId":"alpha-reconciliation-secret-config-apply","appliedAtMs":$applied_ms}}
EOF
chmod 0600 "$command_root/secret-config-apply.json"
fi
phase 'apply reviewed Secret/Config candidates under the bounded operator envelope'
run_deploy reconciliation-secret-config-apply secret-config-apply.json secret-config-apply.result.json
grep -q '"state":"reconciliation_secret_config_applied"' "$result_root/secret-config-apply.result.json" || fail 'Secret/Config candidates did not apply'
secret_apply_digest=$(extract_digest "$result_root/secret-config-apply.result.json" applyDigest)
secret_applied_head_digest=$(extract_digest "$result_root/secret-config-apply.result.json" instanceHeadDigest)
cat >"$command_root/secret-config-apply-verify.json" <<EOF
{"schemaVersion":1,"operation":"local.deployment.reconciliation.secret-config.apply.verify","options":{$secret_apply_options},"request":{"decisionId":"$SECRET_CONFIG_DECISION_ID","secretConfigId":"$SECRET_CONFIG_ID","expectedApplyDigest":"$secret_apply_digest"}}
EOF
chmod 0600 "$command_root/secret-config-apply-verify.json"
run_deploy reconciliation-secret-config-apply-verify secret-config-apply-verify.json secret-config-apply-verify.result.json
grep -q '"state":"reconciliation_secret_config_applied"' "$result_root/secret-config-apply-verify.result.json" || fail 'applied Secret/Config verification failed'
completion_options="\"deploymentRoot\":\"$rehearsal_root\",\"applicationRoot\":\"$application_root\",\"completionRoot\":\"$completion_root\",\"automation\":{\"automationRoot\":\"$automation_root\",\"automationDecisionRoot\":\"$automation_decision_root\",\"automationApplyRoot\":\"$automation_apply_root\",\"targetDatabasePath\":\"$target_database\"},\"secretConfig\":{\"secretConfigRoot\":\"$secret_config_root\",\"secretConfigDecisionRoot\":\"$secret_config_decision_root\",\"secretConfigApplyRoot\":\"$secret_config_apply_root\",\"targetDatabasePath\":\"$target_database\"},\"runHistory\":{\"runHistoryRoot\":\"$run_history_root\",\"decisionFilePath\":\"$secondary_input\"},\"allowRootService\":$allow_root_service"
completion_automation="{\"automationId\":\"$AUTOMATION_ID\",\"decisionId\":\"$AUTOMATION_DECISION_ID\",\"expectedApplyDigest\":\"$automation_apply_digest\"}"
completion_secret_config="{\"secretConfigId\":\"$SECRET_CONFIG_ID\",\"decisionId\":\"$SECRET_CONFIG_DECISION_ID\",\"expectedApplyDigest\":\"$secret_apply_digest\"}"
completion_run_history="{\"preservationId\":\"$RUN_HISTORY_PRESERVATION_ID\",\"expectedPreservationDigest\":\"$preservation_digest\"}"
if [ -e "$command_root/completion.json" ]; then
completed_ms=$(extract_unsigned "$command_root/completion.json" completedAtMs)
else
completed_ms=$((applied_ms + 1))
cat >"$command_root/completion.json" <<EOF
{"schemaVersion":3,"operation":"local.deployment.reconciliation.complete","options":{$completion_options},"request":{"completionId":"$COMPLETION_ID","applicationId":"$APPLICATION_ID","expectedApplicationPlanDigest":"$application_plan_digest","expectedHeadDigest":"$secret_applied_head_digest","automation":$completion_automation,"secretConfig":$completion_secret_config,"runHistory":$completion_run_history,"completedAtMs":$completed_ms}}
EOF
chmod 0600 "$command_root/completion.json"
fi
phase 'seal cross-domain reconciliation completion while both services remain stopped'
run_deploy reconciliation-complete completion.json completion.result.json "$secondary_input"
grep -q '"state":"reconciliation_completed"' "$result_root/completion.result.json" || fail 'cross-domain reconciliation did not complete'
completion_digest=$(extract_digest "$result_root/completion.result.json" completionDigest)
completion_head_digest=$(extract_digest "$result_root/completion.result.json" instanceHeadDigest)
cat >"$command_root/completion-verify.json" <<EOF
{"schemaVersion":3,"operation":"local.deployment.reconciliation.complete.verify","options":{$completion_options},"request":{"completionId":"$COMPLETION_ID","applicationId":"$APPLICATION_ID","expectedCompletionDigest":"$completion_digest","automation":$completion_automation,"secretConfig":$completion_secret_config,"runHistory":$completion_run_history}}
EOF
chmod 0600 "$command_root/completion-verify.json"
run_deploy reconciliation-complete-verify completion-verify.json completion-verify.result.json "$secondary_input"
grep -q '"status":"verified"' "$result_root/completion-verify.result.json" || fail 'cross-domain completion verification failed'
adapter_count=$(extract_unsigned "$result_root/completion.result.json" adapterCount)
[ "$adapter_count" -eq 3 ] || fail 'completion did not bind all three reconciliation adapters'
cat >"$reconciliation_root/summary.json" <<EOF
{"schemaVersion":1,"schema":"qinglong/local-alpha-reconciliation-rehearsal-summary@v1","status":"reconciliation_completed","profile":"$profile","variant":"$VARIANT","sourceRevision":"$SOURCE_REVISION","architecture":"$ARCHITECTURE","review":{"reviewId":"$REVIEW_ID","authority":"authenticated_user"},"automation":{"automationId":"$AUTOMATION_ID","decisionId":"$AUTOMATION_DECISION_ID","decisionDigest":"$automation_decision_digest","applyDigest":"$automation_apply_digest"},"secretConfig":{"secretConfigId":"$SECRET_CONFIG_ID","decisionId":"$SECRET_CONFIG_DECISION_ID","decisionDigest":"$secret_decision_digest","applyDigest":"$secret_apply_digest"},"runHistory":{"preservationId":"$RUN_HISTORY_PRESERVATION_ID","preservationDigest":"$preservation_digest"},"completion":{"completionId":"$COMPLETION_ID","completionDigest":"$completion_digest","adapterCount":$adapter_count,"instanceHeadDigest":"$completion_head_digest"},"target":"stopped","legacy":"stopped","targetRestart":"not_authorized","legacyRestart":"not_authorized","next":"independent_restart_authority_required"}
EOF
chmod 0600 "$reconciliation_root/summary.json"
printf '%s\n' \
'Automation, Secret/Config, and Run History evidence reached verified reconciliation completion.' \
"Summary: $reconciliation_root/summary.json" \
"Completion evidence: $result_root/completion-verify.result.json" \
'Target and Legacy remain stopped. Restart requires a separate authority ceremony.'
exit 0
fi
grep -q '"status":"automation_decision_required"' "$reconciliation_root/summary.json" || fail 'Automation application phase is detached from Automation decision state'
decision_preparation_digest=$(extract_digest "$result_root/automation-decision-prepare.result.json" preparationDigest)
decision_head_digest=$(extract_digest "$result_root/automation-decision-prepare.result.json" instanceHeadDigest)
if [ -e "$command_root/automation-decision-commit.json" ]; then
@@ -450,6 +571,71 @@ chmod 0600 "$command_root/automation-apply-verify.json"
run_deploy reconciliation-automation-apply-verify automation-apply-verify.json automation-apply-verify.result.json
grep -q '"state":"reconciliation_automation_applied"' "$result_root/automation-apply-verify.result.json" || fail 'applied Automation verification failed'
if [ "$mode" = apply-plan ]; then
application_plan_digest=$(extract_digest "$result_root/application-commit.result.json" applicationPlanDigest)
preserved_ms=$((applied_ms + 1))
cat >"$command_root/run-history-preserve.json" <<EOF
{"schemaVersion":1,"operation":"local.deployment.reconciliation.run-history.preserve","options":{"deploymentRoot":"$rehearsal_root","applicationRoot":"$application_root","runHistoryRoot":"$run_history_root","allowRootService":$allow_root_service},"request":{"preservationId":"$RUN_HISTORY_PRESERVATION_ID","applicationId":"$APPLICATION_ID","expectedApplicationPlanDigest":"$application_plan_digest","expectedHeadDigest":"$applied_head_digest","decisionFilePath":"$secondary_input","preservedAtMs":$preserved_ms}}
EOF
chmod 0600 "$command_root/run-history-preserve.json"
phase 'preserve dual-sided terminal Run History before Secret/Config advances the head'
run_deploy reconciliation-run-history-preserve run-history-preserve.json run-history-preserve.result.json "$secondary_input"
grep -q '"state":"reconciliation_run_history_preserved"' "$result_root/run-history-preserve.result.json" || fail 'Run History preservation failed'
preservation_digest=$(extract_digest "$result_root/run-history-preserve.result.json" preservationDigest)
cat >"$command_root/run-history-verify.json" <<EOF
{"schemaVersion":1,"operation":"local.deployment.reconciliation.run-history.verify","options":{"deploymentRoot":"$rehearsal_root","applicationRoot":"$application_root","runHistoryRoot":"$run_history_root","allowRootService":$allow_root_service},"request":{"preservationId":"$RUN_HISTORY_PRESERVATION_ID","applicationId":"$APPLICATION_ID","expectedPreservationDigest":"$preservation_digest","decisionFilePath":"$secondary_input"}}
EOF
chmod 0600 "$command_root/run-history-verify.json"
run_deploy reconciliation-run-history-verify run-history-verify.json run-history-verify.result.json "$secondary_input"
grep -q '"status":"verified"' "$result_root/run-history-verify.result.json" || fail 'Run History preservation verification failed'
legacy_history_facts=$(extract_unsigned "$result_root/run-history-preserve.result.json" legacyFactCount)
target_history_facts=$(extract_unsigned "$result_root/run-history-preserve.result.json" targetFactCount)
[ "$legacy_history_facts" -gt 0 ] && [ "$target_history_facts" -gt 0 ] || fail 'Run History evidence is not dual-sided'
secret_prepared_ms=$((preserved_ms + 1))
cat >"$command_root/secret-config-plan.json" <<EOF
{"schemaVersion":1,"operation":"local.deployment.reconciliation.secret-config.plan","options":{"deploymentRoot":"$rehearsal_root","applicationRoot":"$application_root","secretConfigRoot":"$secret_config_root","allowRootService":$allow_root_service},"request":{"secretConfigId":"$SECRET_CONFIG_ID","applicationId":"$APPLICATION_ID","expectedApplicationPlanDigest":"$application_plan_digest","expectedHeadDigest":"$applied_head_digest","decisionFilePath":"$secondary_input","projectId":"default","preparedAtMs":$secret_prepared_ms}}
EOF
chmod 0600 "$command_root/secret-config-plan.json"
phase 'materialize reviewed Secret/Config candidate plan'
run_deploy reconciliation-secret-config-plan secret-config-plan.json secret-config-plan.result.json "$secondary_input"
grep -q '"state":"reconciliation_secret_config_planned"' "$result_root/secret-config-plan.result.json" || fail 'Secret/Config plan did not materialize'
grep -q '"outcome":"ready"' "$result_root/secret-config-plan.result.json" || fail 'Secret/Config plan is manual-required or has no applicable candidates'
secret_config_plan_digest=$(extract_digest "$result_root/secret-config-plan.result.json" secretConfigPlanDigest)
cat >"$command_root/secret-config-verify.json" <<EOF
{"schemaVersion":1,"operation":"local.deployment.reconciliation.secret-config.verify","options":{"deploymentRoot":"$rehearsal_root","applicationRoot":"$application_root","secretConfigRoot":"$secret_config_root","allowRootService":$allow_root_service},"request":{"secretConfigId":"$SECRET_CONFIG_ID","expectedSecretConfigPlanDigest":"$secret_config_plan_digest"}}
EOF
chmod 0600 "$command_root/secret-config-verify.json"
run_deploy reconciliation-secret-config-verify secret-config-verify.json secret-config-verify.result.json
grep -q '"status":"verified"' "$result_root/secret-config-verify.result.json" || fail 'Secret/Config plan verification failed'
secret_config_head_digest=$(extract_digest "$result_root/secret-config-verify.result.json" instanceHeadDigest)
secret_decision_prepared_ms=$((secret_prepared_ms + 1))
cat >"$command_root/secret-config-decision-prepare.json" <<EOF
{"schemaVersion":1,"operation":"local.deployment.reconciliation.secret-config.decision.prepare","options":{"deploymentRoot":"$rehearsal_root","applicationRoot":"$application_root","secretConfigRoot":"$secret_config_root","secretConfigDecisionRoot":"$secret_config_decision_root","allowRootService":$allow_root_service},"request":{"decisionId":"$SECRET_CONFIG_DECISION_ID","secretConfigId":"$SECRET_CONFIG_ID","expectedSecretConfigPlanDigest":"$secret_config_plan_digest","expectedHeadDigest":"$secret_config_head_digest","preparedAtMs":$secret_decision_prepared_ms}}
EOF
chmod 0600 "$command_root/secret-config-decision-prepare.json"
run_deploy reconciliation-secret-config-decision-prepare secret-config-decision-prepare.json secret-config-decision-prepare.result.json
grep -q '"state":"reconciliation_secret_config_decision_prepared"' "$result_root/secret-config-decision-prepare.result.json" || fail 'Secret/Config decision authority was not prepared'
secret_decision_preparation_digest=$(extract_digest "$result_root/secret-config-decision-prepare.result.json" preparationDigest)
secret_rows=$(extract_unsigned "$result_root/secret-config-plan.result.json" rowCount)
eligible_bindings=$(extract_unsigned "$result_root/secret-config-plan.result.json" eligibleBindingCount)
eligible_preservations=$(extract_unsigned "$result_root/secret-config-plan.result.json" eligiblePreservationCount)
target_conflicts=$(extract_unsigned "$result_root/secret-config-plan.result.json" targetConflictCount)
unadapted_configs=$(extract_unsigned "$result_root/secret-config-plan.result.json" unadaptedLegacyConfigCount)
[ $((eligible_bindings + eligible_preservations)) -gt 0 ] && [ "$target_conflicts" -eq 0 ] && [ "$unadapted_configs" -eq 0 ] || fail 'Secret/Config plan is not eligible for reviewed completion'
cat >"$reconciliation_root/summary.json" <<EOF
{"schemaVersion":1,"schema":"qinglong/local-alpha-reconciliation-rehearsal-summary@v1","status":"secret_config_decision_required","profile":"$profile","variant":"$VARIANT","sourceRevision":"$SOURCE_REVISION","architecture":"$ARCHITECTURE","review":{"reviewId":"$REVIEW_ID","authority":"authenticated_user"},"application":{"applicationId":"$APPLICATION_ID","applicationPlanDigest":"$application_plan_digest"},"automation":{"automationId":"$AUTOMATION_ID","decisionId":"$AUTOMATION_DECISION_ID","decisionDigest":"$decision_digest","applyDigest":"$apply_digest"},"runHistory":{"preservationId":"$RUN_HISTORY_PRESERVATION_ID","preservationDigest":"$preservation_digest","legacyFactCount":$legacy_history_facts,"targetFactCount":$target_history_facts},"secretConfig":{"secretConfigId":"$SECRET_CONFIG_ID","secretConfigPlanDigest":"$secret_config_plan_digest","rowCount":$secret_rows,"eligibleBindingCount":$eligible_bindings,"eligiblePreservationCount":$eligible_preservations,"targetConflictCount":$target_conflicts,"unadaptedLegacyConfigCount":$unadapted_configs},"secretConfigDecision":{"decisionId":"$SECRET_CONFIG_DECISION_ID","preparationDigest":"$secret_decision_preparation_digest"},"target":"stopped","legacy":"stopped","automaticCandidateDecision":"not_authorized","next":"supply_external_secret_config_decisions"}
EOF
chmod 0600 "$reconciliation_root/summary.json"
printf '%s\n' \
'Automation application, dual Run History preservation, and Secret/Config plan are ready.' \
"Summary: $reconciliation_root/summary.json" \
"Secret/Config plan: $secret_config_root/$SECRET_CONFIG_ID/plan.ndjson" \
'No Secret/Config candidate decision was generated or applied. Supply an external owner-private NDJSON decision file to the complete phase.'
exit 0
fi
if [ -e "$command_root/automation-rollback.json" ]; then
rolled_back_ms=$(extract_unsigned "$command_root/automation-rollback.json" rolledBackAtMs)
else