@aephia/atlas-kit 0.6.0-next.98 → 0.6.0

package/dist/planning/index.js

@@ -1,51 +1,22 @@
-import { validateCurrencyInstructions } from '../internal/planning/currency-cache-guard.js';
-import { normalizeFleetDockFundingGuard, dockFundingGuardToJSON, validateFleetDockFundingGuards, } from '../internal/planning/fleet-dock-funding-guard.js';
-import { normalizeLocalMarketOrderGuard, localMarketOrderGuardToJSON, validateLocalMarketOrderInstructions, } from '../internal/planning/local-market-order.js';
-import { validateCrewTransferInstructions, } from '../internal/planning/fleet-crew-guard.js';
-import { validateCompletionInstructions, scanCompletionDiscriminators, } from '../internal/planning/scan-completion-guard.js';
-import { validateOpenSignalInstructions } from '../internal/planning/open-signal-guard.js';
-import { validateDetectInstructions, } from '../internal/planning/scan-detect-guard.js';
-import { validateRespawnInstructions } from '../internal/planning/respawn-guards.js';
-import { validateFleetAttackInstructions, } from '../internal/planning/fleet-attack-xp.js';
-import { validateMovementXpInstructions } from '../internal/planning/movement-xp-guard.js';
-import { validateFleetDockingGuards } from '../internal/planning/fleet-docking-guard.js';
-import { validateStarbaseSystemInstructions, validateStarbaseSystemGuards, } from '../internal/planning/starbase-system-guard.js';
-import { validateCharacterRegistrationInstructions } from '../internal/planning/character-registration-guard.js';
-import { normalizeArrivalGuard, arrivalGuardToJSON, validateArrivalInstructions, } from '../internal/planning/arrival-guards.js';
-import { isRuntimeGuard, normalizeRuntimeGuard, runtimeGuardToJSON, validateRuntimeInstructions, } from '../internal/planning/runtime-guards.js';
-import { isTradeBuyGuard, isTradeSellGuard, isTradeMeterGuard, isFactionTradeGuard, } from '../internal/planning/faction-trade-guards.js';
-import { AccountRole, getBase64Decoder, getBase64Encoder, isAddress, isWritableRole, } from '@solana/kit';
-import { InvalidActionInputError, SageSdkError } from '../client/errors.js';
-import { deepFreeze } from '../internal/immutable-tree.js';
-import { validateMiningStopInstructions } from '../internal/planning/mining-stop.js';
-import { validatePlanComposition } from './composition.js';
-import { isPlanInstance, registerPlanInstance } from './plan-instances.js';
+import {} from '../internal/planning/fleet-dock-funding-guard.js';
+import {} from '../internal/planning/local-market-order.js';
+import {} from '../internal/planning/scan-completion-guard.js';
+import {} from '../internal/planning/arrival-guards.js';
+import {} from '../internal/planning/runtime-guards.js';
+import { assertKeys, invalid, readAddress, readRecord, readString, } from '../internal/planning/plan-fields.js';
+import { normalizePrecondition } from '../internal/planning/plan-guards.js';
+import { AccountRole, getBase64Decoder, getBase64Encoder, } from '@solana/kit';
+import { InvalidActionInputError } from '../client/errors.js';
+import { brandPlan, immutableInstruction } from './plan-construction.js';
+import { isPlanInstance } from './plan-instances.js';
+import { validateCreationBindings, validateHydrationBindings, validatePlanBindings, } from './plan-validation.js';
 const BASE64_PATTERN = /^(?:[A-Za-z\d+/]{4})*(?:[A-Za-z\d+/]{2}==|[A-Za-z\d+/]{3}=)?$/u;
-const DATA_HASH_PATTERN = /^[\da-f]{64}$/u;
 const ACCOUNT_ROLES = new Set([
     AccountRole.READONLY,
     AccountRole.WRITABLE,
     AccountRole.READONLY_SIGNER,
     AccountRole.WRITABLE_SIGNER,
 ]);
-function invalid(field, value, acceptedRange) {
-    throw new InvalidActionInputError(field, value, acceptedRange, 'Correct this Plan field and recreate or hydrate the Plan before retrying.');
-}
-function readRecord(value, field) {
-    if (value === null || typeof value !== 'object' || Array.isArray(value)) {
-        return invalid(field, value, 'a plain object');
-    }
-    return value;
-}
-function assertKeys(value, field, required, optional = []) {
-    const keys = Object.keys(value);
-    const accepted = new Set([...required, ...optional]);
-    const missing = required.find((key) => !Object.hasOwn(value, key));
-    const unexpected = keys.find((key) => !accepted.has(key));
-    if (missing !== undefined || unexpected !== undefined) {
-        invalid(field, missing === undefined ? unexpected : `missing ${missing}`, `exactly the fields ${[...required, ...optional].join(', ')}`);
-    }
-}
 function readArray(value, field) {
     if (!Array.isArray(value)) {
         return invalid(field, value, 'an ordered array');
@@ -59,29 +30,16 @@ function readArray(value, field) {
     }
     return normalized;
 }
-function readString(value, field) {
-    return typeof value === 'string' ? value : invalid(field, value, 'a string');
-}
 function readToken(value, field) {
     return typeof value === 'string' && value.length > 0
         ? value
         : invalid(field, value, 'a non-empty string');
 }
-function readAddress(value, field) {
-    return typeof value === 'string' && isAddress(value)
-        ? value
-        : invalid(field, value, 'a valid base58 Solana address');
-}
 function readRole(value, field) {
     return typeof value === 'number' && ACCOUNT_ROLES.has(value)
         ? value
         : invalid(field, value, 'an AccountRole integer from 0 through 3');
 }
-function readDataHash(value, field) {
-    return typeof value === 'string' && DATA_HASH_PATTERN.test(value)
-        ? value
-        : invalid(field, value, 'a lowercase 64-character SHA-256 hex digest');
-}
 function decodeBase64(value, field) {
     if (typeof value !== 'string' || !BASE64_PATTERN.test(value)) {
         return invalid(field, value, 'canonical base64-encoded instruction bytes');
@@ -92,23 +50,6 @@ function decodeBase64(value, field) {
     }
     return bytes;
 }
-function uniqueAddresses(addresses) {
-    return Object.freeze([...new Set(addresses)]);
-}
-function immutableInstruction(programAddress, accounts, data) {
-    const instruction = {
-        ...(accounts === undefined ? {} : { accounts }),
-        programAddress,
-    };
-    if (data !== undefined) {
-        const bytes = new Uint8Array(data);
-        Object.defineProperty(instruction, 'data', {
-            enumerable: true,
-            get: () => new Uint8Array(bytes),
-        });
-    }
-    return Object.freeze(instruction);
-}
 function normalizeInstruction(value, field) {
     const instruction = readRecord(value, field);
     assertKeys(instruction, field, ['programAddress'], ['accounts', 'data']);
@@ -175,864 +116,6 @@ function normalizeSemanticFact(value, field) {
     }
     return invalid(`${field}.kind`, semantic.kind, 'one of exclusive, requires, invalidates, or transition');
 }
-function normalizePrecondition(value, field) {
-    const precondition = readRecord(value, field);
-    if (precondition.kind === 'fleet-arrival')
-        return normalizeArrivalGuard(precondition, field);
-    if (isRuntimeGuard(precondition))
-        return normalizeRuntimeGuard(precondition, field);
-    if (precondition.kind === 'character-registration') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'profile',
-            'profileDataHash',
-            'funder',
-            'xpBudget',
-            'xpBudgetConfig',
-            'maximumFunderDebit',
-            'characterSize',
-            'initializationHash',
-            'characterLamports',
-            'budgetLamports',
-            'describes',
-        ]);
-        if (typeof precondition.characterSize !== 'number' ||
-            !Number.isSafeInteger(precondition.characterSize) ||
-            precondition.characterSize < 423)
-            invalid(`${field}.characterSize`, precondition.characterSize, 'a qualified Character allocation of at least 423 bytes');
-        for (const key of ['characterLamports', 'budgetLamports'])
-            if (typeof precondition[key] !== 'bigint' || precondition[key] < 0n)
-                invalid(`${field}.${key}`, precondition[key], 'a nonnegative bigint');
-        const maximumFunderDebit = precondition.maximumFunderDebit;
-        if (typeof maximumFunderDebit !== 'bigint' || maximumFunderDebit < 0n)
-            invalid(`${field}.maximumFunderDebit`, maximumFunderDebit, 'a nonnegative bigint');
-        return Object.freeze({
-            kind: 'character-registration',
-            address: readAddress(precondition.address, `${field}.address`),
-            game: readAddress(precondition.game, `${field}.game`),
-            profile: readAddress(precondition.profile, `${field}.profile`),
-            profileDataHash: readDataHash(precondition.profileDataHash, `${field}.profileDataHash`),
-            funder: readAddress(precondition.funder, `${field}.funder`),
-            xpBudget: readAddress(precondition.xpBudget, `${field}.xpBudget`),
-            xpBudgetConfig: readAddress(precondition.xpBudgetConfig, `${field}.xpBudgetConfig`),
-            maximumFunderDebit,
-            characterLamports: precondition.characterLamports,
-            budgetLamports: precondition.budgetLamports,
-            characterSize: precondition.characterSize,
-            initializationHash: readDataHash(precondition.initializationHash, `${field}.initializationHash`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'ship-import-funding') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'profile',
-            'system',
-            'shipId',
-            'maximumProfileDebit',
-            'describes',
-        ]);
-        const shipId = precondition.shipId;
-        if (typeof shipId !== 'number' ||
-            !Number.isInteger(shipId) ||
-            shipId < 0 ||
-            shipId > 65535)
-            invalid(`${field}.shipId`, shipId, 'an unsigned u16 ship configuration ID');
-        const maximumProfileDebit = precondition.maximumProfileDebit;
-        if (typeof maximumProfileDebit !== 'bigint' || maximumProfileDebit < 0n)
-            invalid(`${field}.maximumProfileDebit`, maximumProfileDebit, 'a nonnegative bigint');
-        return Object.freeze({
-            kind: 'ship-import-funding',
-            address: readAddress(precondition.address, `${field}.address`),
-            game: readAddress(precondition.game, `${field}.game`),
-            profile: readAddress(precondition.profile, `${field}.profile`),
-            system: readAddress(precondition.system, `${field}.system`),
-            shipId,
-            maximumProfileDebit,
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'fleet-attack') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'defender',
-            'game',
-            'profile',
-            'defenderProfile',
-            'instructionKey',
-            'describes',
-        ]);
-        return Object.freeze({
-            kind: 'fleet-attack',
-            address: readAddress(precondition.address, `${field}.address`),
-            defender: readAddress(precondition.defender, `${field}.defender`),
-            game: readAddress(precondition.game, `${field}.game`),
-            profile: readAddress(precondition.profile, `${field}.profile`),
-            defenderProfile: readAddress(precondition.defenderProfile, `${field}.defenderProfile`),
-            instructionKey: readString(precondition.instructionKey, `${field}.instructionKey`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'currency-cache') {
-        assertKeys(precondition, field, ['kind', 'address', 'game', 'describes']);
-        return Object.freeze({
-            kind: 'currency-cache',
-            address: readAddress(precondition.address, `${field}.address`),
-            game: readAddress(precondition.game, `${field}.game`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'movement-character') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'profile',
-            'stateHash',
-            'describes',
-        ]);
-        return Object.freeze({
-            kind: 'movement-character',
-            address: readAddress(precondition.address, `${field}.address`),
-            game: readAddress(precondition.game, `${field}.game`),
-            profile: readAddress(precondition.profile, `${field}.profile`),
-            stateHash: readDataHash(precondition.stateHash, `${field}.stateHash`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'fleet-docking-policy') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'system',
-            'ownership',
-            'describes',
-        ]);
-        return Object.freeze({
-            kind: 'fleet-docking-policy',
-            address: readAddress(precondition.address, `${field}.address`),
-            game: readAddress(precondition.game, `${field}.game`),
-            system: readAddress(precondition.system, `${field}.system`),
-            ownership: readAddress(precondition.ownership, `${field}.ownership`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'starbase-system') {
-        assertKeys(precondition, field, ['kind', 'address', 'game', 'starbaseSequenceId', 'describes'], ['requireCss']);
-        if (precondition.requireCss !== undefined &&
-            precondition.requireCss !== true)
-            invalid(`${field}.requireCss`, precondition.requireCss, 'true when CSS access is required, otherwise omitted');
-        const sequence = precondition.starbaseSequenceId;
-        if (typeof sequence !== 'bigint' ||
-            sequence < 0n ||
-            sequence > 18446744073709551615n)
-            invalid(`${field}.starbaseSequenceId`, sequence, 'an unsigned u64 Starbase sequence');
-        return Object.freeze({
-            kind: 'starbase-system',
-            address: readAddress(precondition.address, `${field}.address`),
-            game: readAddress(precondition.game, `${field}.game`),
-            starbaseSequenceId: sequence,
-            ...(precondition.requireCss === undefined
-                ? {}
-                : { requireCss: true }),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'fleet-mining') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'profile',
-            'asteroid',
-            'describes',
-        ]);
-        return Object.freeze({
-            kind: 'fleet-mining',
-            address: readAddress(precondition.address, `${field}.address`),
-            game: readAddress(precondition.game, `${field}.game`),
-            profile: readAddress(precondition.profile, `${field}.profile`),
-            asteroid: readAddress(precondition.asteroid, `${field}.asteroid`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (isFactionTradeGuard(precondition)) {
-        const kind = precondition.kind;
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'factionId',
-            'describes',
-            'schemaVersion',
-            ...(isTradeBuyGuard(precondition)
-                ? ['cargoId', 'floorRaw']
-                : isTradeSellGuard(precondition)
-                    ? ['atlasOutCapPerEpochRaw', 'epochLengthSeconds']
-                    : []),
-        ]);
-        const unsigned = (key, max = 65535) => {
-            const n = precondition[key];
-            if (typeof n !== 'number' || !Number.isInteger(n) || n < 0 || n > max)
-                invalid(`${field}.${key}`, n, `an unsigned ${max === 255 ? 'u8' : 'u16'} integer`);
-            return n;
-        };
-        const integer = (key, signed = false) => {
-            const n = precondition[key];
-            const min = signed ? -(1n << 63n) : 0n;
-            const max = signed ? (1n << 63n) - 1n : (1n << 64n) - 1n;
-            if (typeof n !== 'bigint' || n < min || n > max)
-                invalid(`${field}.${key}`, n, signed ? 'an i64 bigint' : 'a u64 bigint');
-            return n;
-        };
-        const common = {
-            address: readAddress(precondition.address, `${field}.address`),
-            game: readAddress(precondition.game, `${field}.game`),
-            factionId: unsigned('factionId'),
-            schemaVersion: unsigned('schemaVersion', 255),
-            describes: readString(precondition.describes, `${field}.describes`),
-        };
-        if (isTradeBuyGuard(precondition))
-            return Object.freeze({
-                kind,
-                ...common,
-                cargoId: unsigned('cargoId'),
-                floorRaw: integer('floorRaw'),
-            });
-        if (isTradeSellGuard(precondition))
-            return Object.freeze({
-                kind,
-                ...common,
-                atlasOutCapPerEpochRaw: integer('atlasOutCapPerEpochRaw'),
-                epochLengthSeconds: integer('epochLengthSeconds', true),
-            });
-        return Object.freeze({ kind, ...common });
-    }
-    if (precondition.kind === 'fleet-add-ship') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'profile',
-            'authority',
-            'system',
-            'shipId',
-            'amount',
-            'keyIndex',
-            'configHash',
-            'maximumProfileDebit',
-            'describes',
-        ]);
-        const keyIndex = precondition.keyIndex;
-        if (typeof keyIndex !== 'number' ||
-            !Number.isInteger(keyIndex) ||
-            keyIndex < 0 ||
-            keyIndex > 65535)
-            invalid(`${field}.keyIndex`, keyIndex, 'an integer from 0 through 65535');
-        const shipId = precondition.shipId;
-        if (typeof shipId !== 'number' ||
-            !Number.isInteger(shipId) ||
-            shipId < 0 ||
-            shipId > 65535)
-            invalid(`${field}.shipId`, shipId, 'a u16 ship configuration ID');
-        const amount = precondition.amount;
-        if (typeof amount !== 'bigint' || amount < 1n || amount > 255n)
-            invalid(`${field}.amount`, amount, 'a whole ship quantity from 1n through 255n');
-        const maximumProfileDebit = precondition.maximumProfileDebit;
-        if (typeof maximumProfileDebit !== 'bigint' || maximumProfileDebit < 0n)
-            invalid(`${field}.maximumProfileDebit`, maximumProfileDebit, 'a nonnegative bigint');
-        return Object.freeze({
-            kind: 'fleet-add-ship',
-            address: readAddress(precondition.address, `${field}.address`),
-            game: readAddress(precondition.game, `${field}.game`),
-            profile: readAddress(precondition.profile, `${field}.profile`),
-            authority: readAddress(precondition.authority, `${field}.authority`),
-            system: readAddress(precondition.system, `${field}.system`),
-            keyIndex,
-            shipId,
-            amount,
-            maximumProfileDebit,
-            configHash: readDataHash(precondition.configHash, `${field}.configHash`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'scan-completion') {
-        const addresses = [
-            'address',
-            'game',
-            'signal',
-            'profile',
-            'character',
-            'authority',
-            'policy',
-            'loot',
-            'xpBudget',
-            'xpConfig',
-        ];
-        assertKeys(precondition, field, [
-            'kind',
-            'operation',
-            ...addresses,
-            'keyIndex',
-            'status',
-            'expectedSequence',
-            'configHash',
-            'describes',
-        ]);
-        if (typeof precondition.operation !== 'string' ||
-            !Object.hasOwn(scanCompletionDiscriminators, precondition.operation))
-            invalid(field, precondition.operation, 'a supported scan lifecycle operation');
-        const keyIndex = precondition.keyIndex, status = precondition.status, sequence = precondition.expectedSequence;
-        if (typeof keyIndex !== 'number' ||
-            !Number.isInteger(keyIndex) ||
-            keyIndex < 0 ||
-            keyIndex > 65535)
-            invalid(field, keyIndex, 'a u16 key index');
-        if (typeof status !== 'number' ||
-            !Number.isInteger(status) ||
-            status < 1 ||
-            status > 6)
-            invalid(field, status, 'a current nonempty signal state');
-        if (typeof sequence !== 'bigint' ||
-            sequence < 0n ||
-            sequence > 18446744073709551615n)
-            invalid(field, sequence, 'a u64 sequence');
-        const parsed = Object.fromEntries(addresses.map((k) => [k, readAddress(precondition[k], `${field}.${k}`)]));
-        return Object.freeze({
-            kind: 'scan-completion',
-            operation: precondition.operation,
-            ...parsed,
-            keyIndex,
-            status,
-            expectedSequence: sequence,
-            configHash: readDataHash(precondition.configHash, field),
-            describes: readString(precondition.describes, field),
-        });
-    }
-    if (precondition.kind === 'scan-detect') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'profile',
-            'authority',
-            'character',
-            'signal',
-            'pattern',
-            'policy',
-            'loot',
-            'tracker',
-            'keyIndex',
-            'patternId',
-            'focus',
-            'expectedSequence',
-            'policyRevision',
-            'profileRevision',
-            'configHash',
-            'describes',
-        ]);
-        const numbers = {};
-        for (const [key, max] of [
-            ['keyIndex', 65535],
-            ['patternId', 65535],
-            ['focus', 4],
-            ['policyRevision', 4294967295],
-            ['profileRevision', 4294967295],
-        ]) {
-            const value = precondition[key];
-            if (typeof value !== 'number' ||
-                !Number.isInteger(value) ||
-                value < 0 ||
-                value > max)
-                invalid(`${field}.${key}`, value, `an integer from zero through ${max}`);
-            numbers[key] = value;
-        }
-        const sequence = precondition.expectedSequence;
-        if (typeof sequence !== 'bigint' ||
-            sequence < 0n ||
-            sequence > 18446744073709551615n)
-            invalid(`${field}.expectedSequence`, sequence, 'a u64 bigint');
-        return Object.freeze({
-            kind: 'scan-detect',
-            address: readAddress(precondition.address, field),
-            game: readAddress(precondition.game, field),
-            profile: readAddress(precondition.profile, field),
-            authority: readAddress(precondition.authority, field),
-            character: readAddress(precondition.character, field),
-            signal: readAddress(precondition.signal, field),
-            pattern: readAddress(precondition.pattern, field),
-            policy: readAddress(precondition.policy, field),
-            loot: readAddress(precondition.loot, field),
-            tracker: readAddress(precondition.tracker, field),
-            keyIndex: numbers.keyIndex,
-            patternId: numbers.patternId,
-            focus: numbers.focus,
-            policyRevision: numbers.policyRevision,
-            profileRevision: numbers.profileRevision,
-            expectedSequence: sequence,
-            configHash: readDataHash(precondition.configHash, field),
-            describes: readString(precondition.describes, field),
-        });
-    }
-    if (precondition.kind === 'fleet-crew-transfer') {
-        assertKeys(precondition, field, [
-            'kind',
-            'direction',
-            'address',
-            'game',
-            'profile',
-            'authority',
-            'system',
-            'starbasePlayer',
-            'keyIndex',
-            'count',
-            'systemSequenceId',
-            'describes',
-        ]);
-        for (const key of ['count', 'keyIndex']) {
-            const n = precondition[key];
-            if (typeof n !== 'number' ||
-                !Number.isInteger(n) ||
-                n < (key === 'count' ? 1 : 0) ||
-                n > 65535)
-                invalid(field, n, 'a positive u16 count and u16 key index');
-        }
-        const direction = precondition.direction, sequence = precondition.systemSequenceId;
-        if (direction !== 'load' && direction !== 'unload')
-            invalid(field, direction, 'load or unload');
-        if (typeof sequence !== 'bigint' ||
-            sequence < 0n ||
-            sequence > (1n << 64n) - 1n)
-            invalid(field, sequence, 'a u64 System generation');
-        return Object.freeze({
-            kind: 'fleet-crew-transfer',
-            direction,
-            address: readAddress(precondition.address, field),
-            game: readAddress(precondition.game, field),
-            profile: readAddress(precondition.profile, field),
-            authority: readAddress(precondition.authority, field),
-            system: readAddress(precondition.system, field),
-            starbasePlayer: readAddress(precondition.starbasePlayer, field),
-            count: precondition.count,
-            keyIndex: precondition.keyIndex,
-            systemSequenceId: sequence,
-            describes: readString(precondition.describes, field),
-        });
-    }
-    if (precondition.kind === 'fleet-respawn') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'profile',
-            'authority',
-            'system',
-            'keyIndex',
-            'phase',
-            'fleetHash',
-            'maximumRecoveryFee',
-            'maximumProfileDebit',
-            'describes',
-        ]);
-        const keyIndex = precondition.keyIndex;
-        if (typeof keyIndex !== 'number' ||
-            !Number.isInteger(keyIndex) ||
-            keyIndex < 0 ||
-            keyIndex > 65535)
-            invalid(`${field}.keyIndex`, keyIndex, 'a u16 key index');
-        const phase = precondition.phase;
-        if (phase !== 'start' && phase !== 'complete')
-            invalid(`${field}.phase`, phase, 'start or complete');
-        const maximumRecoveryFee = precondition.maximumRecoveryFee, maximumProfileDebit = precondition.maximumProfileDebit;
-        for (const value of [maximumRecoveryFee, maximumProfileDebit])
-            if (typeof value !== 'bigint' || value < 0n || value > (1n << 64n) - 1n)
-                invalid(field, value, 'a nonnegative u64 funding ceiling');
-        return Object.freeze({
-            kind: 'fleet-respawn',
-            address: readAddress(precondition.address, field),
-            game: readAddress(precondition.game, field),
-            profile: readAddress(precondition.profile, field),
-            authority: readAddress(precondition.authority, field),
-            system: readAddress(precondition.system, field),
-            keyIndex,
-            phase,
-            fleetHash: readDataHash(precondition.fleetHash, field),
-            maximumRecoveryFee: maximumRecoveryFee,
-            maximumProfileDebit: maximumProfileDebit,
-            describes: readString(precondition.describes, field),
-        });
-    }
-    if (precondition.kind === 'fleet-dock-funding')
-        return normalizeFleetDockFundingGuard(precondition);
-    if (precondition.kind === 'local-market-order')
-        return normalizeLocalMarketOrderGuard(precondition);
-    if (precondition.kind === 'scan-signal-open') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'fleet',
-            'profile',
-            'authority',
-            'character',
-            'keyIndex',
-            'authorityHash',
-            'maximumProfileDebit',
-            'describes',
-        ]);
-        const keyIndex = precondition.keyIndex;
-        if (typeof keyIndex !== 'number' ||
-            !Number.isInteger(keyIndex) ||
-            keyIndex < 0 ||
-            keyIndex > 65535)
-            invalid(field, keyIndex, 'a u16 key index');
-        const maximumProfileDebit = precondition.maximumProfileDebit;
-        if (typeof maximumProfileDebit !== 'bigint' ||
-            maximumProfileDebit < 0n ||
-            maximumProfileDebit > 0xffffffffffffffffn)
-            invalid(field, maximumProfileDebit, 'a nonnegative u64 funding ceiling');
-        return Object.freeze({
-            kind: 'scan-signal-open',
-            authorityHash: readDataHash(precondition.authorityHash, field),
-            address: readAddress(precondition.address, field),
-            game: readAddress(precondition.game, field),
-            fleet: readAddress(precondition.fleet, field),
-            profile: readAddress(precondition.profile, field),
-            authority: readAddress(precondition.authority, field),
-            character: readAddress(precondition.character, field),
-            keyIndex,
-            maximumProfileDebit,
-            describes: readString(precondition.describes, field),
-        });
-    }
-    if (precondition.kind === 'fleet-create') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'profile',
-            'authority',
-            'system',
-            'keyIndex',
-            'label',
-            'maximumProfileDebit',
-            'describes',
-        ]);
-        const keyIndex = precondition.keyIndex;
-        if (typeof keyIndex !== 'number' ||
-            !Number.isSafeInteger(keyIndex) ||
-            keyIndex < 0 ||
-            keyIndex > 65_535)
-            invalid(`${field}.keyIndex`, keyIndex, 'an integer from 0 through 65535');
-        const label = readString(precondition.label, `${field}.label`);
-        const bytes = new TextEncoder().encode(label);
-        if (label.trim().length === 0 ||
-            label.includes('\0') ||
-            bytes.length > 64 ||
-            new TextDecoder('utf-8', { ignoreBOM: true }).decode(bytes) !== label)
-            invalid(`${field}.label`, label, 'a nonblank, NUL-free Unicode label of at most 64 UTF-8 bytes');
-        const maximumProfileDebit = precondition.maximumProfileDebit;
-        if (typeof maximumProfileDebit !== 'bigint' || maximumProfileDebit < 0n)
-            invalid(`${field}.maximumProfileDebit`, maximumProfileDebit, 'a nonnegative bigint');
-        return Object.freeze({
-            kind: 'fleet-create',
-            address: readAddress(precondition.address, `${field}.address`),
-            game: readAddress(precondition.game, `${field}.game`),
-            profile: readAddress(precondition.profile, `${field}.profile`),
-            authority: readAddress(precondition.authority, `${field}.authority`),
-            system: readAddress(precondition.system, `${field}.system`),
-            keyIndex,
-            label,
-            maximumProfileDebit,
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'system-account-or-absent') {
-        assertKeys(precondition, field, ['kind', 'address', 'describes']);
-        return Object.freeze({
-            kind: 'system-account-or-absent',
-            address: readAddress(precondition.address, `${field}.address`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'recipe-state') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'configHash',
-            'requiredUses',
-            'describes',
-        ]);
-        const requiredUses = precondition.requiredUses;
-        if (typeof requiredUses !== 'bigint' ||
-            requiredUses < 0n ||
-            requiredUses > (1n << 64n) - 1n)
-            invalid(`${field}.requiredUses`, requiredUses, 'an unsigned u64 bigint');
-        const configHash = readDataHash(precondition.configHash, `${field}.configHash`);
-        return Object.freeze({
-            kind: 'recipe-state',
-            address: readAddress(precondition.address, `${field}.address`),
-            configHash,
-            requiredUses,
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'token-mint') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'decimals',
-            'describes',
-        ]);
-        const decimals = precondition.decimals;
-        if (typeof decimals !== 'number' ||
-            !Number.isInteger(decimals) ||
-            decimals < 0 ||
-            decimals > 255)
-            invalid(`${field}.decimals`, decimals, 'an unsigned u8 mint decimals value');
-        return Object.freeze({
-            kind: 'token-mint',
-            address: readAddress(precondition.address, `${field}.address`),
-            decimals,
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'game-ship-config') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'shipId',
-            'configHash',
-            'describes',
-        ]);
-        const id = precondition.shipId;
-        if (typeof id !== 'number' || !Number.isInteger(id) || id < 0 || id > 65535)
-            invalid(`${field}.shipId`, id, 'a u16 ship configuration ID');
-        return Object.freeze({
-            kind: 'game-ship-config',
-            address: readAddress(precondition.address, `${field}.address`),
-            shipId: id,
-            configHash: readDataHash(precondition.configHash, `${field}.configHash`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'game-account') {
-        assertKeys(precondition, field, ['kind', 'address', 'describes']);
-        return Object.freeze({
-            kind: 'game-account',
-            address: readAddress(precondition.address, `${field}.address`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (['game-cargo-bytes-config', 'token-account', 'cargo-cache'].includes(String(precondition.kind))) {
-        const base = {
-            address: readAddress(precondition.address, `${field}.address`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        };
-        if (precondition.kind === 'token-account') {
-            assertKeys(precondition, field, [
-                'kind',
-                'address',
-                'mint',
-                'owner',
-                'minimumBalance',
-                'describes',
-            ]);
-            const amount = precondition.minimumBalance;
-            if (typeof amount !== 'bigint' ||
-                amount < 0n ||
-                amount > (1n << 64n) - 1n)
-                invalid(`${field}.minimumBalance`, amount, 'an unsigned u64 bigint');
-            return Object.freeze({
-                ...base,
-                kind: 'token-account',
-                mint: readAddress(precondition.mint, `${field}.mint`),
-                owner: readAddress(precondition.owner, `${field}.owner`),
-                minimumBalance: amount,
-            });
-        }
-        if (precondition.kind === 'game-cargo-bytes-config') {
-            assertKeys(precondition, field, [
-                'kind',
-                'address',
-                'cargoId',
-                'configHash',
-                'describes',
-            ]);
-            const id = precondition.cargoId;
-            if (typeof id !== 'number' ||
-                !Number.isInteger(id) ||
-                id < 0 ||
-                id > 65535)
-                invalid(`${field}.cargoId`, id, 'a u16 cargo ID');
-            return Object.freeze({
-                ...base,
-                kind: precondition.kind,
-                cargoId: id,
-                configHash: readDataHash(precondition.configHash, `${field}.configHash`),
-            });
-        }
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'game',
-            'bump',
-            'describes',
-        ]);
-        const bump = precondition.bump;
-        if (typeof bump !== 'number' ||
-            !Number.isInteger(bump) ||
-            bump < 0 ||
-            bump > 255)
-            invalid(`${field}.bump`, bump, 'a u8 PDA bump');
-        return Object.freeze({
-            ...base,
-            kind: 'cargo-cache',
-            game: readAddress(precondition.game, `${field}.game`),
-            bump,
-        });
-    }
-    if (precondition.kind === 'token-account-or-absent') {
-        assertKeys(precondition, field, [
-            'kind',
-            'address',
-            'mint',
-            'owner',
-            'describes',
-        ]);
-        return Object.freeze({
-            kind: 'token-account-or-absent',
-            address: readAddress(precondition.address, `${field}.address`),
-            mint: readAddress(precondition.mint, `${field}.mint`),
-            owner: readAddress(precondition.owner, `${field}.owner`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind === 'account-absent') {
-        assertKeys(precondition, field, ['kind', 'address', 'describes']);
-        return Object.freeze({
-            kind: 'account-absent',
-            address: readAddress(precondition.address, `${field}.address`),
-            describes: readString(precondition.describes, `${field}.describes`),
-        });
-    }
-    if (precondition.kind !== 'account-state') {
-        invalid(`${field}.kind`, precondition.kind, 'a supported current Plan guard; recreate the Plan using the current capability planner');
-    }
-    assertKeys(precondition, field, ['kind', 'address', 'dataHash', 'describes']);
-    return Object.freeze({
-        kind: 'account-state',
-        address: readAddress(precondition.address, `${field}.address`),
-        dataHash: readDataHash(precondition.dataHash, `${field}.dataHash`),
-        describes: readString(precondition.describes, `${field}.describes`),
-    });
-}
-function getAffected(steps) {
-    return uniqueAddresses(steps.flatMap((step) => (step.instruction.accounts ?? [])
-        .filter((account) => isWritableRole(account.role))
-        .map((account) => account.address)));
-}
-function getRequiredSigners(steps) {
-    return uniqueAddresses(steps.flatMap((step) => step.signers));
-}
-function instructionToJSON(instruction) {
-    const value = {
-        ...(instruction.accounts === undefined
-            ? {}
-            : {
-                accounts: instruction.accounts.map((account) => ({
-                    address: account.address,
-                    role: account.role,
-                })),
-            }),
-        ...(instruction.data === undefined
-            ? {}
-            : { data: getBase64Decoder().decode(instruction.data) }),
-        programAddress: instruction.programAddress,
-    };
-    return deepFreeze(value);
-}
-function planToJSON(plan) {
-    return deepFreeze({
-        v: 27,
-        kind: plan.kind,
-        summary: plan.summary,
-        affected: [...plan.affected],
-        requiredSigners: [...plan.requiredSigners],
-        steps: plan.steps.map((step) => ({
-            instruction: instructionToJSON(step.instruction),
-            describes: step.describes,
-            ...((step.semantics?.length ?? 0) > 0
-                ? { semantics: step.semantics.map((semantic) => ({ ...semantic })) }
-                : {}),
-            signers: [...step.signers],
-        })),
-        preconditions: plan.preconditions.map((guard) => {
-            if (guard.kind === 'recipe-state')
-                return { ...guard, requiredUses: String(guard.requiredUses) };
-            if (guard.kind === 'scan-detect' || guard.kind === 'scan-completion')
-                return { ...guard, expectedSequence: String(guard.expectedSequence) };
-            if (guard.kind === 'fleet-dock-funding')
-                return dockFundingGuardToJSON(guard);
-            if (guard.kind === 'fleet-arrival')
-                return arrivalGuardToJSON(guard);
-            if (guard.kind === 'fleet-crew-transfer')
-                return { ...guard, systemSequenceId: String(guard.systemSequenceId) };
-            if (guard.kind === 'fleet-respawn')
-                return {
-                    ...guard,
-                    maximumRecoveryFee: String(guard.maximumRecoveryFee),
-                    maximumProfileDebit: String(guard.maximumProfileDebit),
-                };
-            if (isRuntimeGuard(guard))
-                return runtimeGuardToJSON(guard);
-            if (isTradeBuyGuard(guard))
-                return { ...guard, floorRaw: String(guard.floorRaw) };
-            if (isTradeSellGuard(guard))
-                return {
-                    ...guard,
-                    atlasOutCapPerEpochRaw: String(guard.atlasOutCapPerEpochRaw),
-                    epochLengthSeconds: String(guard.epochLengthSeconds),
-                };
-            if (guard.kind === 'fleet-add-ship')
-                return {
-                    ...guard,
-                    amount: String(guard.amount),
-                    maximumProfileDebit: String(guard.maximumProfileDebit),
-                };
-            if (guard.kind === 'character-registration')
-                return {
-                    ...guard,
-                    maximumFunderDebit: String(guard.maximumFunderDebit),
-                    characterLamports: String(guard.characterLamports),
-                    budgetLamports: String(guard.budgetLamports),
-                };
-            if (guard.kind === 'scan-signal-open' ||
-                guard.kind === 'fleet-create' ||
-                guard.kind === 'ship-import-funding')
-                return {
-                    ...guard,
-                    maximumProfileDebit: String(guard.maximumProfileDebit),
-                };
-            if (guard.kind === 'starbase-system')
-                return {
-                    ...guard,
-                    starbaseSequenceId: String(guard.starbaseSequenceId),
-                };
-            if (guard.kind === 'local-market-order')
-                return localMarketOrderGuardToJSON(guard);
-            if (guard.kind === 'token-account')
-                return { ...guard, minimumBalance: String(guard.minimumBalance) };
-            return { ...guard };
-        }),
-    });
-}
 /** Creates an inert branded Plan while deriving every aggregate field.
  *
  * @example
@@ -1052,30 +135,8 @@ export function createPlan(input) {
     assertKeys(value, 'plan', ['kind', 'summary', 'steps', 'preconditions']);
     const steps = Object.freeze(readArray(value.steps, 'plan.steps').map((step, index) => normalizeStep(step, `plan.steps[${String(index)}]`)));
     const preconditions = Object.freeze(readArray(value.preconditions, 'plan.preconditions').map((precondition, index) => normalizePrecondition(precondition, `plan.preconditions[${String(index)}]`)));
-    validateCurrencyInstructions(steps, preconditions);
-    validateShipImportFundingComposition(preconditions);
-    validateStarbaseSystemGuards(steps, preconditions);
-    validateFleetDockingGuards(steps, preconditions);
-    validateFleetDockFundingGuards(steps, preconditions);
-    validateDetectInstructions(steps, preconditions);
-    validateCompletionInstructions(steps, preconditions);
-    validateRespawnInstructions(steps, preconditions);
-    validateCrewTransferInstructions(steps, preconditions);
-    validateOpenSignalInstructions(steps, preconditions);
-    validateLocalMarketOrderInstructions(steps, preconditions);
-    const descriptions = Object.freeze(steps.map((step) => step.describes));
-    const plan = {
-        kind: readString(value.kind, 'plan.kind'),
-        summary: readString(value.summary, 'plan.summary'),
-        steps,
-        preconditions,
-        affected: getAffected(steps),
-        requiredSigners: getRequiredSigners(steps),
-        describe: () => descriptions,
-        toJSON: () => planToJSON(plan),
-    };
-    registerPlanInstance(plan);
-    return Object.freeze(plan);
+    validateCreationBindings(steps, preconditions);
+    return brandPlan(readString(value.kind, 'plan.kind'), readString(value.summary, 'plan.summary'), steps, preconditions);
 }
 function readWireInstruction(value, field) {
     const instruction = readRecord(value, field);
@@ -1124,114 +185,9 @@ export function planFromJSON(json) {
         'affected',
         'requiredSigners',
     ]);
-    if (value.v !== 27) {
-        throw new InvalidActionInputError('planJson.v', value.v, 'the current Plan wire version 27', 'Recreate the Plan using the current capability planner; do not change its saved version or migrate its guards.');
+    if (value.v !== 35) {
+        throw new InvalidActionInputError('planJson.v', value.v, 'the current Plan wire version 35', 'Recreate the Plan using the current capability planner; do not change its saved version or migrate its guards.');
     }
-    value.preconditions = readArray(value.preconditions, 'planJson.preconditions').map((entry) => {
-        const guard = readRecord(entry, 'precondition');
-        if (guard.kind === 'recipe-state') {
-            if (typeof guard.requiredUses !== 'string' ||
-                !/^(0|[1-9][0-9]*)$/.test(guard.requiredUses))
-                invalid('requiredUses', guard.requiredUses, 'a canonical unsigned decimal string');
-            return { ...guard, requiredUses: BigInt(guard.requiredUses) };
-        }
-        if (guard.kind === 'fleet-dock-funding')
-            return normalizeFleetDockFundingGuard(guard, true);
-        if (guard.kind === 'local-market-order')
-            return normalizeLocalMarketOrderGuard(guard, true);
-        if (guard.kind === 'scan-detect' || guard.kind === 'scan-completion') {
-            if (typeof guard.expectedSequence !== 'string' ||
-                !/^(0|[1-9][0-9]*)$/.test(guard.expectedSequence))
-                invalid('expectedSequence', guard.expectedSequence, 'a canonical unsigned decimal string');
-            return { ...guard, expectedSequence: BigInt(guard.expectedSequence) };
-        }
-        if (guard.kind === 'fleet-arrival')
-            return normalizeArrivalGuard(guard, 'precondition', true);
-        if (isRuntimeGuard(guard))
-            return normalizeRuntimeGuard(guard, 'precondition', true);
-        if (isTradeBuyGuard(guard) || isTradeSellGuard(guard)) {
-            const keys = isTradeBuyGuard(guard)
-                ? ['floorRaw']
-                : ['atlasOutCapPerEpochRaw', 'epochLengthSeconds'];
-            const decoded = { ...guard };
-            for (const key of keys) {
-                const raw = guard[key];
-                const pattern = key === 'epochLengthSeconds'
-                    ? /^(0|[1-9][0-9]*|-[1-9][0-9]*)$/
-                    : /^(0|[1-9][0-9]*)$/;
-                if (typeof raw !== 'string' || !pattern.test(raw))
-                    invalid(key, raw, 'a canonical decimal string');
-                decoded[key] = BigInt(raw);
-            }
-            return decoded;
-        }
-        if (guard.kind === 'fleet-add-ship') {
-            for (const field of ['amount', 'maximumProfileDebit'])
-                if (typeof guard[field] !== 'string' ||
-                    !/^(0|[1-9][0-9]*)$/.test(guard[field]))
-                    invalid(field, guard[field], 'a canonical unsigned decimal string');
-            return {
-                ...guard,
-                amount: BigInt(guard.amount),
-                maximumProfileDebit: BigInt(guard.maximumProfileDebit),
-            };
-        }
-        if (guard.kind === 'character-registration') {
-            for (const key of ['characterLamports', 'budgetLamports'])
-                if (typeof guard[key] !== 'string' ||
-                    !/^(0|[1-9][0-9]*)$/.test(guard[key]))
-                    invalid(key, guard[key], 'a canonical unsigned decimal string');
-            if (typeof guard.maximumFunderDebit !== 'string' ||
-                !/^(0|[1-9][0-9]*)$/.test(guard.maximumFunderDebit))
-                invalid('maximumFunderDebit', guard.maximumFunderDebit, 'a canonical unsigned decimal string');
-            return {
-                ...guard,
-                maximumFunderDebit: BigInt(guard.maximumFunderDebit),
-                characterLamports: BigInt(guard.characterLamports),
-                budgetLamports: BigInt(guard.budgetLamports),
-            };
-        }
-        if (guard.kind === 'fleet-crew-transfer') {
-            if (typeof guard.systemSequenceId !== 'string' ||
-                !/^(0|[1-9][0-9]*)$/.test(guard.systemSequenceId))
-                invalid('systemSequenceId', guard.systemSequenceId, 'a canonical unsigned decimal string');
-            return { ...guard, systemSequenceId: BigInt(guard.systemSequenceId) };
-        }
-        if (guard.kind === 'fleet-respawn') {
-            for (const key of ['maximumRecoveryFee', 'maximumProfileDebit'])
-                if (typeof guard[key] !== 'string' ||
-                    !/^(0|[1-9][0-9]*)$/.test(guard[key]))
-                    invalid(key, guard[key], 'a canonical unsigned decimal string');
-            return {
-                ...guard,
-                maximumRecoveryFee: BigInt(guard.maximumRecoveryFee),
-                maximumProfileDebit: BigInt(guard.maximumProfileDebit),
-            };
-        }
-        if (guard.kind === 'scan-signal-open' ||
-            guard.kind === 'fleet-create' ||
-            guard.kind === 'ship-import-funding') {
-            if (typeof guard.maximumProfileDebit !== 'string' ||
-                !/^(0|[1-9][0-9]*)$/.test(guard.maximumProfileDebit))
-                invalid('maximumProfileDebit', guard.maximumProfileDebit, 'a canonical unsigned decimal string');
-            return {
-                ...guard,
-                maximumProfileDebit: BigInt(guard.maximumProfileDebit),
-            };
-        }
-        if (guard.kind === 'starbase-system') {
-            if (typeof guard.starbaseSequenceId !== 'string' ||
-                !/^(0|[1-9][0-9]*)$/.test(guard.starbaseSequenceId))
-                invalid('starbaseSequenceId', guard.starbaseSequenceId, 'a canonical unsigned decimal string');
-            return { ...guard, starbaseSequenceId: BigInt(guard.starbaseSequenceId) };
-        }
-        if (guard.kind !== 'token-account')
-            return guard;
-        if (typeof guard.minimumBalance !== 'string' ||
-            !/^(0|[1-9][0-9]*)$/.test(guard.minimumBalance))
-            invalid('minimumBalance', guard.minimumBalance, 'a canonical unsigned decimal string');
-        return { ...guard, minimumBalance: BigInt(guard.minimumBalance) };
-    });
     const steps = readArray(value.steps, 'planJson.steps').map((candidate, index) => {
         const field = `planJson.steps[${String(index)}]`;
         const step = readRecord(candidate, field);
@@ -1247,21 +203,15 @@ export function planFromJSON(json) {
             signers: readArray(step.signers, `${field}.signers`).map((signer, signerIndex) => readAddress(signer, `${field}.signers[${String(signerIndex)}]`)),
         };
     });
-    const preconditions = readArray(value.preconditions, 'planJson.preconditions').map((candidate, index) => normalizePrecondition(candidate, `planJson.preconditions[${String(index)}]`));
+    const preconditions = readArray(value.preconditions, 'planJson.preconditions').map((candidate, index) => normalizePrecondition(candidate, `planJson.preconditions[${String(index)}]`, true));
     const affected = readArray(value.affected, 'planJson.affected').map((candidate, index) => readAddress(candidate, `planJson.affected[${String(index)}]`));
     const requiredSigners = readArray(value.requiredSigners, 'planJson.requiredSigners').map((candidate, index) => readAddress(candidate, `planJson.requiredSigners[${String(index)}]`));
-    const plan = createPlan({
-        kind: readString(value.kind, 'planJson.kind'),
-        summary: readString(value.summary, 'planJson.summary'),
-        steps,
-        preconditions,
-    });
-    validateStarbaseSystemInstructions(plan.steps, plan.preconditions);
-    validateFleetDockingGuards(plan.steps, plan.preconditions);
-    validateFleetDockFundingGuards(plan.steps, plan.preconditions);
-    validateMovementXpInstructions(plan.steps, plan.preconditions);
-    validateFleetAttackInstructions(plan.steps, plan.preconditions);
-    validateCharacterRegistrationInstructions(plan.steps, plan.preconditions);
+    const kind = readString(value.kind, 'planJson.kind');
+    const summary = readString(value.summary, 'planJson.summary');
+    const normalizedSteps = Object.freeze(steps.map((step, index) => normalizeStep(step, `planJson.steps[${String(index)}]`)));
+    const normalizedPreconditions = Object.freeze(preconditions);
+    validateHydrationBindings(normalizedSteps, normalizedPreconditions);
+    const plan = brandPlan(kind, summary, normalizedSteps, normalizedPreconditions);
     if (!sameAddresses(plan.affected, affected)) {
         invalid('planJson.affected', value.affected, 'the first-seen union of writable instruction account addresses');
     }
@@ -1278,49 +228,6 @@ function assertPlan(value, index) {
 function combinedSummary(steps) {
     return steps.map((step) => step.describes).join(' ');
 }
-function validateShipImportFundingComposition(guards) {
-    const targets = new Map();
-    for (const guard of guards) {
-        if (guard.kind !== 'ship-import-funding')
-            continue;
-        const identity = `${guard.game}:${guard.profile}:${guard.system}:${String(guard.shipId)}`;
-        const previous = targets.get(guard.address);
-        if (previous !== undefined && previous !== identity)
-            throw new SageSdkError('INCOMPATIBLE_PLAN_COMPOSITION', 'Ship imports retain conflicting identities or different configurations for one StarbasePlayer. Use separate confirmed imports, then refresh inventory and replan; prefunding cannot be shared across independently estimated storage growth.');
-        targets.set(guard.address, identity);
-    }
-}
-function validateFactionGuardComposition(guards) {
-    const retained = new Map();
-    for (const guard of guards) {
-        if (!isFactionTradeGuard(guard))
-            continue;
-        const constraints = [
-            [
-                `${isTradeMeterGuard(guard) ? 'meter' : 'treasury'}:${guard.address}:identity`,
-                `${guard.game}:${String(guard.factionId)}`,
-            ],
-        ];
-        if (!isTradeMeterGuard(guard)) {
-            constraints.push(isTradeBuyGuard(guard)
-                ? [
-                    `${guard.address}:buy:${String(guard.cargoId)}`,
-                    String(guard.floorRaw),
-                ]
-                : [
-                    `${guard.address}:sell`,
-                    `${String(guard.atlasOutCapPerEpochRaw)}:${String(guard.epochLengthSeconds)}`,
-                ]);
-        }
-        constraints.push([`${guard.address}:schema`, String(guard.schemaVersion)]);
-        for (const [key, value] of constraints) {
-            const previous = retained.get(key);
-            if (previous !== undefined && previous !== value)
-                throw new SageSdkError('INCOMPATIBLE_PLAN_COMPOSITION', 'Faction Market Plans retain incompatible Treasury policy or shared account identity. Refresh the affected Markets and prepare compatible Plans, or use separate confirmed transactions.');
-            retained.set(key, value);
-        }
-    }
-}
 /** Combines one or more Plans with deterministic associative flattening.
  *
  * Semantic validation is eager. Conflict indices are relative to the flattened
@@ -1339,31 +246,11 @@ export function combinePlans(...plans) {
         throw new InvalidActionInputError('plans', plans.length, 'one or more Plan values', 'Pass at least one Plan to combinePlans before retrying.');
     }
     plans.forEach(assertPlan);
-    const steps = plans.flatMap((plan) => plan.steps);
-    validatePlanComposition(steps);
-    const preconditions = plans.flatMap((plan) => plan.preconditions);
-    validateFactionGuardComposition(preconditions);
-    validateMiningStopInstructions(steps, preconditions);
-    validateStarbaseSystemInstructions(steps, preconditions);
-    validateFleetDockingGuards(steps, preconditions);
-    validateFleetDockFundingGuards(steps, preconditions);
-    validateCharacterRegistrationInstructions(steps, preconditions);
-    validateArrivalInstructions(steps, preconditions);
-    validateDetectInstructions(steps, preconditions);
-    validateCompletionInstructions(steps, preconditions);
-    validateRespawnInstructions(steps, preconditions);
-    validateCrewTransferInstructions(steps, preconditions);
-    validateOpenSignalInstructions(steps, preconditions);
-    validateLocalMarketOrderInstructions(steps, preconditions);
-    validateRuntimeInstructions(steps, preconditions);
-    validateMovementXpInstructions(steps, preconditions);
-    validateFleetAttackInstructions(steps, preconditions);
-    return createPlan({
-        kind: 'combined',
-        summary: combinedSummary(steps),
-        steps,
-        preconditions,
-    });
+    // Branded Plans hold normalized, frozen contents; validate the union once.
+    const steps = Object.freeze(plans.flatMap((plan) => plan.steps));
+    const preconditions = Object.freeze(plans.flatMap((plan) => plan.preconditions));
+    validatePlanBindings(steps, preconditions);
+    return brandPlan('combined', combinedSummary(steps), steps, preconditions);
 }
 export { assemblePlan } from './assembly.js';
 export { executePlan, } from './execution.js';