@aephia/atlas-kit 0.6.0-next.5 → 0.6.0-next.50

package/dist/planning/index.js

@@ -1,6 +1,13 @@
+import { validateMovementXpInstructions } from '../internal/planning/movement-xp-guard.js';
+import { validateCraftingCancellationInstructions } from '../internal/planning/crafting-cancellation-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 } from '../client/errors.js';
+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';
 const PLAN_BRAND = Symbol('AephiaSagePlan');
@@ -159,9 +166,410 @@ function normalizeSemanticFact(value, field) {
     }
     return invalid(`${field}.kind`, semantic.kind, 'one of exclusive, requires, invalidates, or transition');
 }
-function normalizePrecondition(value, field, version = 3) {
+function normalizePrecondition(value, field) {
     const precondition = readRecord(value, field);
-    if (precondition.kind === 'token-account-or-absent' && version === 3) {
+    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 === '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 === 'starbase-system') {
+        assertKeys(precondition, field, [
+            'kind',
+            'address',
+            'game',
+            'starbaseSequenceId',
+            'describes',
+        ]);
+        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,
+            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 === '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 === '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',
@@ -177,7 +585,7 @@ function normalizePrecondition(value, field, version = 3) {
             describes: readString(precondition.describes, `${field}.describes`),
         });
     }
-    if (precondition.kind === 'account-absent' && version !== 1) {
+    if (precondition.kind === 'account-absent') {
         assertKeys(precondition, field, ['kind', 'address', 'describes']);
         return Object.freeze({
             kind: 'account-absent',
@@ -186,11 +594,7 @@ function normalizePrecondition(value, field, version = 3) {
         });
     }
     if (precondition.kind !== 'account-state') {
-        invalid(`${field}.kind`, precondition.kind, version === 3
-            ? 'one of account-state, account-absent, or token-account-or-absent'
-            : version === 2
-                ? 'one of account-state or account-absent'
-                : 'the value 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({
@@ -226,50 +630,60 @@ function instructionToJSON(instruction) {
     return deepFreeze(value);
 }
 function planToJSON(plan) {
-    const hasSemantics = plan.steps.some((step) => (step.semantics?.length ?? 0) > 0);
-    const hasAbsentPrecondition = plan.preconditions.some(({ kind }) => kind === 'account-absent');
-    const common = {
+    return deepFreeze({
+        v: 18,
         kind: plan.kind,
         summary: plan.summary,
         affected: [...plan.affected],
         requiredSigners: [...plan.requiredSigners],
-    };
-    const 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],
-    }));
-    if (plan.preconditions.some(({ kind }) => kind === 'token-account-or-absent')) {
-        return deepFreeze({
-            v: 3,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => ({ ...guard })),
-        });
-    }
-    if (hasSemantics || hasAbsentPrecondition) {
-        return deepFreeze({
-            v: 2,
-            ...common,
-            steps,
-            preconditions: plan.preconditions.map((guard) => ({
-                ...guard,
-            })),
-        });
-    }
-    return deepFreeze({
-        v: 1,
-        ...common,
-        steps,
-        preconditions: plan.preconditions.map((precondition) => ({
-            kind: 'account-state',
-            address: precondition.address,
-            dataHash: precondition.dataHash,
-            describes: precondition.describes,
+        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 === 'fleet-arrival')
+                return arrivalGuardToJSON(guard);
+            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 === '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 === 'token-account')
+                return { ...guard, minimumBalance: String(guard.minimumBalance) };
+            return { ...guard };
+        }),
     });
 }
 /** Creates an inert branded Plan while deriving every aggregate field.
@@ -291,6 +705,7 @@ 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)}]`)));
+    validateShipImportFundingComposition(preconditions);
     const descriptions = Object.freeze(steps.map((step) => step.describes));
     const plan = {
         kind: readString(value.kind, 'plan.kind'),
@@ -337,13 +752,13 @@ function sameAddresses(actual, encoded) {
  *
  * @example
  * ```ts
- * declare const wire: PlanJsonV1 | PlanJsonV2 | PlanJsonV3;
+ * declare const wire: PlanJson;
  * const plan = planFromJSON(wire);
  * console.log(plan.describe());
  * ```
  */
 export function planFromJSON(json) {
-    const value = readRecord(json, 'planJson');
+    const value = { ...readRecord(json, 'planJson') };
     assertKeys(value, 'planJson', [
         'v',
         'kind',
@@ -353,18 +768,87 @@ export function planFromJSON(json) {
         'affected',
         'requiredSigners',
     ]);
-    if (value.v !== 1 && value.v !== 2 && value.v !== 3) {
-        invalid('planJson.v', value.v, 'the Plan wire version 1, 2, or 3');
+    if (value.v !== 18) {
+        throw new InvalidActionInputError('planJson.v', value.v, 'the current Plan wire version 18', 'Recreate the Plan using the current capability planner; do not change its saved version or migrate its guards.');
     }
-    const version = value.v;
+    value.preconditions = readArray(value.preconditions, 'planJson.preconditions').map((entry) => {
+        const guard = readRecord(entry, 'precondition');
+        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-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);
-        assertKeys(step, field, ['instruction', 'describes', 'signers'], version !== 1 ? ['semantics'] : []);
+        assertKeys(step, field, ['instruction', 'describes', 'signers'], ['semantics']);
         return {
             instruction: readWireInstruction(step.instruction, `${field}.instruction`),
             describes: readString(step.describes, `${field}.describes`),
-            ...(version !== 1 && step.semantics !== undefined
+            ...(step.semantics !== undefined
                 ? {
                     semantics: readArray(step.semantics, `${field}.semantics`).map((semantic, semanticIndex) => normalizeSemanticFact(semantic, `${field}.semantics[${String(semanticIndex)}]`)),
                 }
@@ -372,7 +856,7 @@ 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)}]`, version));
+    const preconditions = readArray(value.preconditions, 'planJson.preconditions').map((candidate, index) => normalizePrecondition(candidate, `planJson.preconditions[${String(index)}]`));
     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({
@@ -381,6 +865,9 @@ export function planFromJSON(json) {
         steps,
         preconditions,
     });
+    validateCraftingCancellationInstructions(plan.steps, plan.preconditions);
+    validateMovementXpInstructions(plan.steps, plan.preconditions);
+    validateCharacterRegistrationInstructions(plan.steps, plan.preconditions);
     if (!sameAddresses(plan.affected, affected)) {
         invalid('planJson.affected', value.affected, 'the first-seen union of writable instruction account addresses');
     }
@@ -397,6 +884,49 @@ 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
@@ -417,11 +947,19 @@ export function combinePlans(...plans) {
     plans.forEach(assertPlan);
     const steps = plans.flatMap((plan) => plan.steps);
     validatePlanComposition(steps);
+    const preconditions = plans.flatMap((plan) => plan.preconditions);
+    validateFactionGuardComposition(preconditions);
+    validateMiningStopInstructions(steps, preconditions);
+    validateCraftingCancellationInstructions(steps, preconditions);
+    validateCharacterRegistrationInstructions(steps, preconditions);
+    validateArrivalInstructions(steps, preconditions);
+    validateRuntimeInstructions(steps, preconditions);
+    validateMovementXpInstructions(steps, preconditions);
     return createPlan({
         kind: 'combined',
         summary: combinedSummary(steps),
         steps,
-        preconditions: plans.flatMap((plan) => plan.preconditions),
+        preconditions,
     });
 }
 export { assemblePlan } from './assembly.js';