@aephia/atlas-kit 0.6.0-next.7 → 0.6.0-next.71

package/dist/client/index.js

@@ -3,4 +3,5 @@ export { AccountDecodeError, AccountNotFoundError, ContextDisposedError, Invalid
 export { readMeta, } from '../internal/read-meta.js';
 export { entityRef } from './refs.js';
 export { InvalidDefinitionSectionError } from './errors.js';
+export { createRpcSubscriptionProvider, } from './rpc-subscription-provider.js';
 //# sourceMappingURL=index.js.map

package/dist/client/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,oBAAoB,EACpB,wBAAwB,EACxB,yBAAyB,EACzB,2BAA2B,EAC3B,oBAAoB,EACpB,uBAAuB,EACvB,aAAa,EACb,0BAA0B,EAC1B,gCAAgC,EAChC,sBAAsB,EACtB,YAAY,GAGb,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,QAAQ,GAOT,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAkB,MAAM,WAAW,CAAC;AAUtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,oBAAoB,EACpB,wBAAwB,EACxB,yBAAyB,EACzB,2BAA2B,EAC3B,oBAAoB,EACpB,uBAAuB,EACvB,aAAa,EACb,0BAA0B,EAC1B,gCAAgC,EAChC,sBAAsB,EACtB,YAAY,GAGb,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,QAAQ,GAOT,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAkB,MAAM,WAAW,CAAC;AAUtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EACL,6BAA6B,GAE9B,MAAM,gCAAgC,CAAC"}

package/dist/client/rpc-subscription-provider.d.ts

@@ -0,0 +1,35 @@
+import { type AccountNotificationsApi, type RpcSubscriptions } from '@solana/kit';
+import type { AccountSubscriptionProvider, DataSourceIdentity } from './contracts.js';
+/** Options for the injected Kit WebSocket account adapter. No connection is opened by the factory.
+ *
+ * @example
+ * ```ts
+ * import type { AccountNotificationsApi, RpcSubscriptions } from '@solana/kit';
+ * declare const rpcSubscriptions: RpcSubscriptions<AccountNotificationsApi>;
+ * const options: RpcSubscriptionProviderOptions = { rpcSubscriptions };
+ * ```
+ */
+export interface RpcSubscriptionProviderOptions {
+    readonly rpcSubscriptions: RpcSubscriptions<AccountNotificationsApi>;
+    /** Non-secret provenance label; never supply an endpoint or credentials. */
+    readonly identity?: DataSourceIdentity;
+    readonly backoff?: {
+        readonly initialMs?: number;
+        readonly maxMs?: number;
+    };
+}
+/** Adapt an application-owned Kit transport to context-owned account subscriptions.
+ * Initial registration failures reject with a sanitized ProviderError. Dropped
+ * streams retry with equal jitter (half to all of the capped exponential delay).
+ * Successful registration resets backoff. Cancellation releases Kit through its
+ * abort signal; iterator cleanup is best-effort and cannot block unsubscribe.
+ *
+ * @example
+ * ```ts
+ * import type { AccountNotificationsApi, RpcSubscriptions } from '@solana/kit';
+ * declare const rpcSubscriptions: RpcSubscriptions<AccountNotificationsApi>;
+ * const subscriptions = createRpcSubscriptionProvider({ rpcSubscriptions });
+ * ```
+ */
+export declare function createRpcSubscriptionProvider(options: RpcSubscriptionProviderOptions): AccountSubscriptionProvider;
+//# sourceMappingURL=rpc-subscription-provider.d.ts.map

package/dist/client/rpc-subscription-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc-subscription-provider.d.ts","sourceRoot":"","sources":["../../src/client/rpc-subscription-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,gBAAgB,EACtB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EACV,2BAA2B,EAC3B,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AAGxB;;;;;;;;GAQG;AACH,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;IACrE,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IACvC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7E;AAmDD;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,8BAA8B,GACtC,2BAA2B,CAiI7B"}

package/dist/client/rpc-subscription-provider.js

@@ -0,0 +1,190 @@
+import { getBase64Encoder, } from '@solana/kit';
+import { ProviderError } from './errors.js';
+function registrationError() {
+    return new ProviderError('The WebSocket provider could not register the account subscription. Check the injected Kit connection and retry.');
+}
+// Cancellation races both Kit registration and iteration; a transport that ignores
+// abort cannot keep the public registration pending or deliver after teardown.
+function cancellable(work, signal) {
+    return new Promise((resolve, reject) => {
+        const abort = () => {
+            signal.removeEventListener('abort', abort);
+            reject(registrationError());
+        };
+        signal.addEventListener('abort', abort, { once: true });
+        void work
+            .then(resolve, reject)
+            .finally(() => signal.removeEventListener('abort', abort));
+        if (signal.aborted)
+            abort();
+    });
+}
+async function pause(delay, signal) {
+    // Browsers/Node clamp oversized timeouts to 1ms. Honour all safe integers.
+    while (delay > 0 && !signal.aborted) {
+        const chunk = Math.min(delay, 2_147_483_647);
+        let timer;
+        try {
+            await cancellable(new Promise((resolve) => {
+                timer = setTimeout(resolve, chunk);
+            }), signal);
+        }
+        finally {
+            clearTimeout(timer);
+        }
+        delay -= chunk;
+    }
+}
+function release(iterator) {
+    try {
+        void iterator.return?.().catch(() => undefined);
+    }
+    catch {
+        // Cleanup must not expose transport details or prevent cancellation.
+    }
+}
+/** Adapt an application-owned Kit transport to context-owned account subscriptions.
+ * Initial registration failures reject with a sanitized ProviderError. Dropped
+ * streams retry with equal jitter (half to all of the capped exponential delay).
+ * Successful registration resets backoff. Cancellation releases Kit through its
+ * abort signal; iterator cleanup is best-effort and cannot block unsubscribe.
+ *
+ * @example
+ * ```ts
+ * import type { AccountNotificationsApi, RpcSubscriptions } from '@solana/kit';
+ * declare const rpcSubscriptions: RpcSubscriptions<AccountNotificationsApi>;
+ * const subscriptions = createRpcSubscriptionProvider({ rpcSubscriptions });
+ * ```
+ */
+export function createRpcSubscriptionProvider(options) {
+    const initialMs = options.backoff?.initialMs ?? 250;
+    const maxMs = options.backoff?.maxMs ?? 30_000;
+    if (!Number.isSafeInteger(initialMs) ||
+        initialMs <= 0 ||
+        !Number.isSafeInteger(maxMs) ||
+        maxMs < initialMs) {
+        throw new ProviderError('Subscription backoff values must be positive safe integers with maxMs >= initialMs. Correct the retry configuration.');
+    }
+    const identity = Object.freeze({
+        kind: options.identity?.kind ?? 'websocket',
+        name: options.identity?.name ?? 'rpc-subscriptions',
+    });
+    const rpcSubscriptions = options.rpcSubscriptions;
+    return {
+        identity,
+        async subscribeAccount(request, listener) {
+            const controller = new AbortController();
+            const signal = controller.signal;
+            const { address, signal: requestSignal } = request;
+            const commitment = request.commitment ?? 'confirmed';
+            let closeAttempt;
+            const close = () => {
+                const cleanup = closeAttempt;
+                closeAttempt = undefined;
+                cleanup?.();
+            };
+            const stop = () => {
+                controller.abort();
+                requestSignal?.removeEventListener('abort', stop);
+                close();
+            };
+            requestSignal?.addEventListener('abort', stop, { once: true });
+            if (requestSignal?.aborted)
+                stop();
+            async function open() {
+                if (signal.aborted)
+                    throw registrationError();
+                const attempt = new AbortController();
+                closeAttempt = () => attempt.abort();
+                try {
+                    const pending = rpcSubscriptions
+                        .accountNotifications(address, { commitment, encoding: 'base64' })
+                        .subscribe({ abortSignal: attempt.signal })
+                        .then((stream) => {
+                        const iterator = stream[Symbol.asyncIterator]();
+                        if (signal.aborted) {
+                            release(iterator);
+                            throw registrationError();
+                        }
+                        closeAttempt = () => {
+                            attempt.abort();
+                            release(iterator);
+                        };
+                        return iterator;
+                    });
+                    return await cancellable(pending, signal);
+                }
+                catch {
+                    close();
+                    throw registrationError();
+                }
+            }
+            try {
+                const initial = await open();
+                void (async () => {
+                    let iterator = initial;
+                    while (!signal.aborted) {
+                        // Only transport next()/termination failures enter the retry loop.
+                        try {
+                            while (!signal.aborted) {
+                                const item = await cancellable(iterator.next(), signal);
+                                if (signal.aborted || item.done)
+                                    break;
+                                try {
+                                    listener({
+                                        kind: 'account',
+                                        account: {
+                                            address,
+                                            commitment,
+                                            slot: item.value.context.slot,
+                                            owner: item.value.value.owner,
+                                            lamports: item.value.value.lamports,
+                                            executable: item.value.value.executable,
+                                            data: Uint8Array.from(getBase64Encoder().encode(item.value.value.data[0])),
+                                        },
+                                    });
+                                }
+                                catch {
+                                    // A malformed payload or listener exception is not a dropped
+                                    // transport. No error channel exists on the raw contract.
+                                }
+                            }
+                        }
+                        catch {
+                            // Kit errors are deliberately neither retained nor emitted.
+                        }
+                        close();
+                        let delay = initialMs;
+                        while (!signal.aborted) {
+                            await pause(Math.max(1, Math.floor(delay * (0.5 + Math.random() / 2))), signal);
+                            if (signal.aborted)
+                                break;
+                            try {
+                                iterator = await open();
+                            }
+                            catch {
+                                delay = Math.min(maxMs, delay * 2);
+                                continue;
+                            }
+                            if (!signal.aborted) {
+                                try {
+                                    listener({ kind: 'reconnected' });
+                                }
+                                catch {
+                                    /* Consumer failure is not transport failure. */
+                                }
+                            }
+                            break;
+                        }
+                    }
+                })().catch(stop);
+                return { unsubscribe: async () => stop() };
+            }
+            catch {
+                stop();
+                throw registrationError();
+            }
+        },
+    };
+}
+//# sourceMappingURL=rpc-subscription-provider.js.map

package/dist/client/rpc-subscription-provider.js.map

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

package/dist/combat/actions/index.d.ts.map

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

package/dist/combat/actions/index.js

@@ -1,10 +1,13 @@
+import { fleetAttackInstructionKey, validateFleetAttackActors, } from '../../internal/planning/fleet-attack-xp.js';
+import { resolveXpRuntime } from '../../internal/planning/xp-runtime.js';
 import { getAddressEncoder, isAddress } from '@solana/kit';
+import { resolveActionRuntime } from '../../internal/planning/action-runtime.js';
 import { InvalidActionInputError, SageSdkError } from '../../client/errors.js';
 import { readContextRawAccounts } from '../../client/reconciliation.js';
 import { sage } from '../../internal/c4/bindings.js';
 import { lootAccountDefinition, } from '../../internal/c4/combat.js';
 import { deriveFleetAddress, fleetAccountDefinition, } from '../../internal/c4/fleet.js';
-import { deriveFleetCrewBindingAddress, fleetCrewBindingAccountDefinition, } from '../../internal/c4/fleet-crew-binding.js';
+import { deriveFleetCrewBindingAddress, fleetCrewBindingAccountDefinition, matchesFleetCrewBindingIdentity, } from '../../internal/c4/fleet-crew-binding.js';
 import { deriveFactionAccountAddress, deriveFactionEconomicsConfigAddress, deriveFactionOwnershipAddress, deriveFactionRelationTrackerAddress, deriveFactionTreasuryAddress, deriveKingSystemTrackerAddress, deriveRegionTrackerAddress, factionAccountDefinition, factionEconomicsConfigAccountDefinition, factionOwnershipAccountDefinition, factionRelationTrackerAccountDefinition, factionTreasuryAccountDefinition, kingSystemTrackerAccountDefinition, regionTrackerAccountDefinition, } from '../../internal/c4/factions.js';
 import { characterAccountDefinition, findCharacterPda, } from '../../internal/c4/identity.js';
 import { deriveLoyaltyContributionAddress, deriveLoyaltyEpochAddress, loyaltyContributionAccountDefinition, loyaltyEpochAccountDefinition, } from '../../internal/c4/loyalty.js';
@@ -404,8 +407,7 @@ async function optionalCrewBinding(ctx, fleet) {
     const address = await deriveFleetCrewBindingAddress(fleet.address);
     const [envelope] = await ctx.data.readMany(fleetCrewBindingAccountDefinition, [address]);
     if (envelope !== undefined &&
-        (envelope.data.fleet !== fleet.address ||
-            envelope.data.ownerProfile !== fleet.ownerProfile.address)) {
+        !matchesFleetCrewBindingIdentity(envelope.data, fleet.address, fleet.ownerProfile.address)) {
         fail(`FleetCrewBinding ${address} does not belong to Fleet ${fleet.address} and Profile ${fleet.ownerProfile.address}. Refresh the Fleet crew relationship and retry.`, address);
     }
     return envelope?.address;
@@ -565,58 +567,93 @@ export async function planFleetAttackFleet(ctx, attacker, defender, inputStance,
         deriveRegionTrackerAddress(game),
         deriveFactionRelationTrackerAddress(game),
     ]);
+    const actorIntent = {
+        address: attacker.address,
+        defender: defender.address,
+        game,
+        profile: attacker.ownerProfile.address,
+        defenderProfile: defender.ownerProfile.address,
+    };
+    await validateFleetAttackActors(ctx, actorIntent);
+    const versions = new Map();
+    const attackerXp = await resolveXpRuntime(ctx, { game, character, profile: attacker.ownerProfile.address }, versions);
+    const defenderXp = character === defenderCharacter
+        ? attackerXp
+        : await resolveXpRuntime(ctx, {
+            game,
+            character: defenderCharacter,
+            profile: defender.ownerProfile.address,
+        }, versions);
+    const xpGuards = [...new Set([attackerXp, defenderXp])].map((xp) => ({
+        kind: 'xp-runtime',
+        address: game,
+        intent: xp.intent,
+        accounts: xp.accounts,
+        describes: 'Both operator XP budgets remain canonical and reconciled; earned XP and bank balances may change.',
+    }));
+    const instruction = adaptAttackFleetInstruction({
+        ...(attackerNpc.factionAccount === undefined
+            ? {}
+            : { attackerFactionAccount: attackerNpc.factionAccount }),
+        ...(attackerNpc.ownership === undefined
+            ? {}
+            : { attackerFleetOwnership: attackerNpc.ownership }),
+        attackerRewardsConfig: attackerRewards.config,
+        ...(attackerRewards.contribution === undefined
+            ? {}
+            : { attackerRewardsContribution: attackerRewards.contribution }),
+        ...(attackerRewards.epoch === undefined
+            ? {}
+            : { attackerRewardsEpoch: attackerRewards.epoch }),
+        attackerRewardsRegistry: attackerRewards.registry,
+        ...(defender.state.kind === 'mining'
+            ? { asteroid: defender.state.asteroid.address }
+            : {}),
+        authorization: options.authorization,
+        attackerXpBudget: attackerXp.accounts.xpBudget,
+        defenderXpBudget: defenderXp.accounts.xpBudget,
+        xpBudgetConfig: attackerXp.accounts.xpBudgetConfig,
+        character,
+        ...(crewBinding === undefined ? {} : { crewBinding }),
+        defenderCharacter,
+        ...(defenderNpc.ownership === undefined
+            ? {}
+            : { defenderFleetOwnership: defenderNpc.ownership }),
+        defenderRewardsConfig: defenderRewards.config,
+        ...(defenderRewards.contribution === undefined
+            ? {}
+            : { defenderRewardsContribution: defenderRewards.contribution }),
+        ...(defenderRewards.epoch === undefined
+            ? {}
+            : { defenderRewardsEpoch: defenderRewards.epoch }),
+        defenderRewardsRegistry: defenderRewards.registry,
+        defendingFleet: defender.address,
+        factionRelationTracker,
+        fleet: attacker.address,
+        game,
+        loot: options.loot,
+        recentSlothashes: 'SysvarS1otHashes111111111111111111111111111',
+        regionTracker,
+        stance: generatedStance(stance),
+    });
     const description = `Attack Fleet ${defender.name} (${defender.address}) with Fleet ${attacker.name} (${attacker.address}) using ${stance.ammoUsage} ammunition; range, randomness, rewards, Loot, damage, and final combat arithmetic remain chain-authoritative.`;
     return createPlan({
         kind: 'combat.attack-fleet',
         preconditions: [
+            {
+                kind: 'fleet-attack',
+                ...actorIntent,
+                instructionKey: fleetAttackInstructionKey(instruction),
+                describes: 'The exact attack instruction and both canonical operators remain bound.',
+            },
+            ...xpGuards,
             await precondition(attackerAccount, `Attacking Fleet ${attacker.name} retains its owner, Game, live state, crew, AP, faction, and ship composition.`),
             await precondition(defenderAccount, `Defending Fleet ${defender.name} retains its owner, Game, live state, crew, faction, and ship composition.`),
         ],
         steps: [
             {
                 describes: description,
-                instruction: adaptAttackFleetInstruction({
-                    ...(attackerNpc.factionAccount === undefined
-                        ? {}
-                        : { attackerFactionAccount: attackerNpc.factionAccount }),
-                    ...(attackerNpc.ownership === undefined
-                        ? {}
-                        : { attackerFleetOwnership: attackerNpc.ownership }),
-                    attackerRewardsConfig: attackerRewards.config,
-                    ...(attackerRewards.contribution === undefined
-                        ? {}
-                        : { attackerRewardsContribution: attackerRewards.contribution }),
-                    ...(attackerRewards.epoch === undefined
-                        ? {}
-                        : { attackerRewardsEpoch: attackerRewards.epoch }),
-                    attackerRewardsRegistry: attackerRewards.registry,
-                    ...(defender.state.kind === 'mining'
-                        ? { asteroid: defender.state.asteroid.address }
-                        : {}),
-                    authorization: options.authorization,
-                    character,
-                    ...(crewBinding === undefined ? {} : { crewBinding }),
-                    defenderCharacter,
-                    ...(defenderNpc.ownership === undefined
-                        ? {}
-                        : { defenderFleetOwnership: defenderNpc.ownership }),
-                    defenderRewardsConfig: defenderRewards.config,
-                    ...(defenderRewards.contribution === undefined
-                        ? {}
-                        : { defenderRewardsContribution: defenderRewards.contribution }),
-                    ...(defenderRewards.epoch === undefined
-                        ? {}
-                        : { defenderRewardsEpoch: defenderRewards.epoch }),
-                    defenderRewardsRegistry: defenderRewards.registry,
-                    defendingFleet: defender.address,
-                    factionRelationTracker,
-                    fleet: attacker.address,
-                    game,
-                    loot: options.loot,
-                    recentSlothashes: 'SysvarS1otHashes111111111111111111111111111',
-                    regionTracker,
-                    stance: generatedStance(stance),
-                }),
+                instruction,
                 semantics: [{ kind: 'exclusive', scope: 'transaction' }],
                 signers: [options.authorization.authority, options.loot],
             },
@@ -844,8 +881,7 @@ export async function planFleetAttackStarbase(ctx, attacker, target, inputStance
     const crewBinding = crewBindingAccount === undefined ? undefined : crewBindingAddress;
     if (crewBindingAccount !== undefined) {
         const data = fleetCrewBindingAccountDefinition.decode(crewBindingAccount);
-        if (data.fleet !== attacker.address ||
-            data.ownerProfile !== attacker.ownerProfile.address) {
+        if (!matchesFleetCrewBindingIdentity(data, attacker.address, attacker.ownerProfile.address)) {
             fail(`FleetCrewBinding ${crewBindingAddress} does not belong to Fleet ${attacker.address} and Profile ${attacker.ownerProfile.address}. Refresh the Fleet crew relationship and retry.`, crewBindingAddress);
         }
     }
@@ -969,14 +1005,26 @@ export async function planFleetAttackStarbase(ctx, attacker, target, inputStance
             ]
             : []),
     ];
+    const runtime = await resolveActionRuntime(ctx, {
+        mode: 'starbase-attack',
+        game,
+        system: target.address,
+        starbaseSeqId: starSystemAccountDefinition.decode(systemAccount).sequenceId,
+        character,
+    });
     const description = `Attack with Fleet ${attacker.name} (${attacker.address}) against the shared Starbase at ${target.name} (${target.address}) using ${stance.ammoUsage} ammunition; range, capture-cost debit outcome, randomness, rewards, Loot, damage, and final admissibility remain chain-authoritative.`;
     return createPlan({
         kind: 'combat.attack-starbase',
-        preconditions: [...statePreconditions, ...absencePreconditions],
+        preconditions: [
+            ...statePreconditions,
+            ...absencePreconditions,
+            ...runtime.guards,
+        ],
         steps: [
             {
-                describes: description,
+                describes: `${description} ${runtime.description}`,
                 instruction: adaptAttackStarbaseInstruction({
+                    ...runtime.accounts,
                     ...(attackerNpc.factionAccount === undefined
                         ? {}
                         : { attackerFactionAccount: attackerNpc.factionAccount }),
@@ -1009,7 +1057,7 @@ export async function planFleetAttackStarbase(ctx, attacker, target, inputStance
                 signers: [options.authorization.authority, options.loot],
             },
         ],
-        summary: description,
+        summary: `${description} ${runtime.description}`,
     });
 }
 function lootSnapshotFingerprint(loot) {