Merge resolution: - Resolved conflicts in package.json, src/index.ts, int_accounts, srv_dataprovider, srv_strategy, multiwallet (swap/swap_all/xfer, index), strategy_llm. Core compatibility (core-compat.ts): - getInitPromise(runtime), getServiceLoadPromise(runtime, name) for older/newer @elizaos/core. - hasGenerateObject(runtime), generateObject(runtime, ...args) for runtimes with/without generateObject. - setCache(runtime, key, value, ttl?) for optional TTL; logCompatError/logCompatDebug for pino vs legacy loggers. - Re-export HandlerOptions from types.ts for single import. Service names: - Use INTEL_DATAPROVIDER and INTEL_CHAIN everywhere (replaced TRADER_DATAPROVIDER/TRADER_CHAIN) to match degenIntel plugin registration. - getServiceLoadPromise() call sites use string names matching plugin serviceType (discord, chain_solana, SPARTAN_NEWS_SERVICE, etc.). Build and types: - HandlerOptions in src/types.ts; actions use it instead of @elizaos/core where core lacks it. - Logger calls use pino-style logger.error({ err }, 'msg') where required. - tsk_discord_post: generateObject via core-compat; PostIdeaContent/PostContent types; discord service typed inline. New/added: - src/core-compat.ts, src/types.ts. - act_wallet_assess_positions.ts (DATA_PROVIDER_SERVICE = INTEL_DATAPROVIDER). --- > [!NOTE] > **Medium Risk** > Touches core initialization/service readiness paths and modifies on-chain wallet operations (swap/sweep/transfer) plus position auto-closing logic, which could affect trading behavior and user funds if regressions occur. > > **Overview** > Introduces `src/core-compat.ts` (+ `src/types.ts`) to smooth over older/newer `@elizaos/core` differences (init/service readiness, optional `generateObject`, cache TTL support, and pino-vs-legacy logging), then updates init/services/actions to use these helpers and avoid direct `initPromise`/`getServiceLoadPromise` assumptions. > > Standardizes service wiring around `INTEL_DATAPROVIDER`/`INTEL_CHAIN` and hardens degenIntel data sync: `checkPositions` now supports per-wallet checks, validates that wallets still hold tokens (closing stale/zero-amount positions), skips watch-only wallets for closes, and triggers re-checks after closes. > > Improves multiwallet and trading wallet-write flows by syncing positions after swaps/transfers/sweeps/open-position actions (`notifyWalletWrite`), adds a new `MULTIWALLET_ASSESS_POSITIONS` action for manual reconciliation, refactors `swap_all` to use Solana service token discovery and batch/parallelized Jupiter swaps, and fixes account component persistence/upsert edge cases (mock component shapes, safer `entityId` resolution). > > ^{Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit c24e30cc9faae0ed50a7b70862897f66381747c8. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).}

Greptile Summary

This PR introduces a compatibility layer (`core-compat.ts`) to support multiple versions of `@elizaos/core`, standardizes service names from `TRADER_*` to `INTEL_*` across the codebase, resolves merge conflicts in wallet actions, and adds position sync improvements. **Key changes:** - New `core-compat.ts` provides graceful fallbacks for `initPromise`, `getServiceLoadPromise`, `generateObject`, and cache operations with optional TTL - Service name consistency: `INTEL_DATAPROVIDER` and `INTEL_CHAIN` now used everywhere to match plugin registration - Merge conflict resolution in `act_wallet_swap`, `act_wallet_swap_all`, `act_wallet_xfer`, and `strategy_llm` with improved error handling - New `act_wallet_assess_positions` action allows manual position sync - `notifyWalletWrite` integration ensures position data stays synchronized after wallet modifications - Pino-style logging (`logger.error({ err }, 'msg')`) adopted throughout - `strategy_llm.ts` enhanced with portfolio tracking and SOL balance filtering to prevent counting immobile positions

Confidence Score: 4/5

- This PR is safe to merge with careful testing of the compatibility layer across different core versions - The compatibility layer is well-designed with proper fallbacks, service name standardization is systematic, and merge resolutions appear sound. However, the changes are extensive (53 files, 1395 additions, 813 deletions) and touch critical trading/wallet logic. The compatibility layer needs runtime validation across both old and new core versions to ensure the fallbacks work correctly. - Pay close attention to `src/core-compat.ts`, `src/plugins/degenIntel/services/srv_dataprovider.ts`, `src/plugins/trading/strategies/strategy_llm.ts`, and wallet action files during testing to ensure the compatibility layer works across core versions and position sync logic functions correctly

Important Files Changed

| Filename | Overview | |----------|----------| | src/core-compat.ts | New compatibility layer for handling different `@elizaos/core` versions with graceful fallbacks | | src/types.ts | New file defining `HandlerOptions` type for cross-version compatibility | | src/init.ts | Updated to use core-compat helpers and pino-style logging | | src/plugins/degenIntel/services/srv_dataprovider.ts | Major refactor: uses core-compat, adds position validation logic, improves wallet filtering | | src/plugins/multiwallet/actions/act_wallet_swap.ts | Merge resolution: improved error handling, pino logging, notifyWalletWrite integration | | src/plugins/multiwallet/actions/act_wallet_swap_all.ts | Merge resolution: refactored swap logic, batch sending, notifyWalletWrite integration | | src/plugins/multiwallet/actions/act_wallet_xfer.ts | Merge resolution: callback-based error handling, notifyWalletWrite integration, cleaner error messages | | src/plugins/multiwallet/actions/act_wallet_assess_positions.ts | New action to manually trigger position sync/assessment per wallet | | src/plugins/trading/strategies/strategy_llm.ts | Major refactor: portfolio tracking, position filtering by SOL balance, notifyWalletWrite integration | | src/tasks/tsk_discord_post.ts | Updated to use `generateObject` from core-compat with proper typing |

Flowchart

```mermaid %%{init: {'theme': 'neutral'}}%% flowchart TD A[PR: Staging Fixes & Core-Compat] --> B[Core Compatibility Layer] A --> C[Service Name Standardization] A --> D[Merge Conflict Resolutions] A --> E[Build & Type Fixes] B --> B1[core-compat.ts] B1 --> B2[getInitPromise] B1 --> B3[getServiceLoadPromise] B1 --> B4[generateObject with hasGenerateObject] B1 --> B5[setCache with optional TTL] B1 --> B6[logCompatError/logCompatDebug] C --> C1[TRADER_DATAPROVIDER → INTEL_DATAPROVIDER] C --> C2[TRADER_CHAIN → INTEL_CHAIN] C --> C3[Service registration alignment] D --> D1[act_wallet_swap] D --> D2[act_wallet_swap_all] D --> D3[act_wallet_xfer] D --> D4[strategy_llm] D1 --> D5[notifyWalletWrite integration] D2 --> D5 D3 --> D5 D4 --> D5 E --> E1[HandlerOptions in types.ts] E --> E2[Pino-style logging throughout] E --> E3[TypeScript type fixes] E --> E4[tsk_discord_post generateObject types] D5 --> F[Position Sync Enhancement] F --> F1[ensurePositionsMatchWalletHoldings] F --> F2[act_wallet_assess_positions action] F --> F3[Prevent stale position data] ``` _{Last reviewed commit: c24e30c} ## Summary by CodeRabbit * **New Features** * Added wallet position assessment action for tracking and updating positions across registered wallets. * Enhanced swap and transfer operations with improved balance calculations, ATA management, and clearer user-facing error messages. * Integrated position synchronization notifications after wallet transactions. * **Improvements** * Refined portfolio context in trading strategies with SOL balance filtering and price divergence handling. * Added wallet reserve logic to protect liquidity for position exits. * Improved error handling with structured logging across all services. * Enhanced service integration with version compatibility support.

elizaOS

🏗️ Work in Progress