From de2b9a6d4ab6753af71ded49f3bef4e8d5a13c2d Mon Sep 17 00:00:00 2001
From: pbio <10051819+paulbalaji@users.noreply.github.com>
Date: Tue, 25 Nov 2025 12:56:19 +0000
Subject: [PATCH] feat!: separate rebalancer package

---
 .github/workflows/rebalancer-docker.yml       | 134 ++++++
 Dockerfile                                    |   1 +
 package.json                                  |   1 +
 solhint-plugin/package.json                   |   2 +-
 typescript/ccip-server/package.json           |   4 +-
 typescript/cli/package.json                   |   5 +-
 typescript/cli/src/commands/warp.ts           |  68 ++-
 .../context/strategies/chain/chainResolver.ts |   2 +-
 typescript/cli/src/rebalancer/README.md       | 177 --------
 .../config/RebalancerConfig.test.ts           | 387 ------------------
 .../rebalancer/core/WithInflightGuard.test.ts | 131 ------
 .../src/rebalancer/core/WithSemaphore.test.ts | 112 -----
 typescript/cli/src/rebalancer/index.ts        |   5 -
 typescript/cli/src/rebalancer/runner.ts       | 286 -------------
 typescript/helloworld/package.json            |   2 +-
 typescript/http-registry-server/package.json  |   2 +-
 .../http-registry-server/src/routes/chain.ts  |   4 +-
 .../http-registry-server/src/routes/root.ts   |   4 +-
 .../http-registry-server/src/routes/warp.ts   |   4 +-
 .../helm/rebalancer/templates/_helpers.tpl    |  27 +-
 typescript/infra/helm/rebalancer/values.yaml  |   2 +-
 typescript/infra/package.json                 |   5 +-
 typescript/infra/src/utils/metrics.ts         |   6 +-
 typescript/rebalancer/.gitignore              |   3 +
 typescript/rebalancer/.mocharc.json           |   3 +
 typescript/rebalancer/Dockerfile              |  89 ++++
 typescript/rebalancer/README.md               | 257 ++++++++++++
 typescript/rebalancer/eslint.config.mjs       |  14 +
 typescript/rebalancer/package.json            |  70 ++++
 .../src}/config/RebalancerConfig.ts           |   2 +-
 .../src}/core/Rebalancer.ts                   |   0
 .../rebalancer/src/core/RebalancerService.ts  | 333 +++++++++++++++
 .../src}/core/WithInflightGuard.ts            |   0
 .../src}/core/WithSemaphore.ts                |   0
 .../factories/RebalancerContextFactory.ts     |  53 ++-
 typescript/rebalancer/src/index.ts            |  68 +++
 .../src}/interfaces/IMetrics.ts               |   0
 .../src}/interfaces/IMonitor.ts               |   2 +-
 .../src}/interfaces/IRebalancer.ts            |   0
 .../src}/interfaces/IStrategy.ts              |   0
 .../src}/metrics/Metrics.ts                   |   0
 .../src}/metrics/PriceGetter.ts               |   0
 .../src}/metrics/scripts/metrics.ts           |   0
 .../src}/metrics/types.ts                     |   0
 .../src}/metrics/utils/metrics.ts             |   0
 .../src}/monitor/Monitor.ts                   |   0
 typescript/rebalancer/src/service.ts          | 144 +++++++
 .../src}/strategy/BaseStrategy.ts             |   0
 .../src}/strategy/MinAmountStrategy.test.ts   |   0
 .../src}/strategy/MinAmountStrategy.ts        |   0
 .../src}/strategy/StrategyFactory.test.ts     |   0
 .../src}/strategy/StrategyFactory.ts          |   0
 .../src}/strategy/WeightedStrategy.test.ts    |   0
 .../src}/strategy/WeightedStrategy.ts         |   0
 .../src}/strategy/index.ts                    |   0
 .../src}/test/helpers.ts                      |   0
 .../src}/utils/ExplorerClient.ts              |   0
 .../src}/utils/balanceUtils.test.ts           |   0
 .../src}/utils/balanceUtils.ts                |   0
 .../src}/utils/bridgeUtils.test.ts            |   0
 .../src}/utils/bridgeUtils.ts                 |   0
 typescript/rebalancer/src/utils/errors.ts     |   5 +
 typescript/rebalancer/src/utils/files.ts      | 266 ++++++++++++
 .../src}/utils/generalUtils.ts                |   0
 .../src}/utils/index.ts                       |   0
 .../src}/utils/tokenUtils.ts                  |   0
 typescript/rebalancer/tsconfig.json           |   8 +
 typescript/widgets/package.json               |   2 +-
 yarn.lock                                     |  89 ++--
 69 files changed, 1581 insertions(+), 1198 deletions(-)
 create mode 100644 .github/workflows/rebalancer-docker.yml
 delete mode 100644 typescript/cli/src/rebalancer/README.md
 delete mode 100644 typescript/cli/src/rebalancer/config/RebalancerConfig.test.ts
 delete mode 100644 typescript/cli/src/rebalancer/core/WithInflightGuard.test.ts
 delete mode 100644 typescript/cli/src/rebalancer/core/WithSemaphore.test.ts
 delete mode 100644 typescript/cli/src/rebalancer/index.ts
 delete mode 100644 typescript/cli/src/rebalancer/runner.ts
 create mode 100644 typescript/rebalancer/.gitignore
 create mode 100644 typescript/rebalancer/.mocharc.json
 create mode 100644 typescript/rebalancer/Dockerfile
 create mode 100644 typescript/rebalancer/README.md
 create mode 100644 typescript/rebalancer/eslint.config.mjs
 create mode 100644 typescript/rebalancer/package.json
 rename typescript/{cli/src/rebalancer => rebalancer/src}/config/RebalancerConfig.ts (94%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/core/Rebalancer.ts (100%)
 create mode 100644 typescript/rebalancer/src/core/RebalancerService.ts
 rename typescript/{cli/src/rebalancer => rebalancer/src}/core/WithInflightGuard.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/core/WithSemaphore.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/factories/RebalancerContextFactory.ts (80%)
 create mode 100644 typescript/rebalancer/src/index.ts
 rename typescript/{cli/src/rebalancer => rebalancer/src}/interfaces/IMetrics.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/interfaces/IMonitor.ts (96%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/interfaces/IRebalancer.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/interfaces/IStrategy.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/metrics/Metrics.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/metrics/PriceGetter.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/metrics/scripts/metrics.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/metrics/types.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/metrics/utils/metrics.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/monitor/Monitor.ts (100%)
 create mode 100644 typescript/rebalancer/src/service.ts
 rename typescript/{cli/src/rebalancer => rebalancer/src}/strategy/BaseStrategy.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/strategy/MinAmountStrategy.test.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/strategy/MinAmountStrategy.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/strategy/StrategyFactory.test.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/strategy/StrategyFactory.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/strategy/WeightedStrategy.test.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/strategy/WeightedStrategy.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/strategy/index.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/test/helpers.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/utils/ExplorerClient.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/utils/balanceUtils.test.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/utils/balanceUtils.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/utils/bridgeUtils.test.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/utils/bridgeUtils.ts (100%)
 create mode 100644 typescript/rebalancer/src/utils/errors.ts
 create mode 100644 typescript/rebalancer/src/utils/files.ts
 rename typescript/{cli/src/rebalancer => rebalancer/src}/utils/generalUtils.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/utils/index.ts (100%)
 rename typescript/{cli/src/rebalancer => rebalancer/src}/utils/tokenUtils.ts (100%)
 create mode 100644 typescript/rebalancer/tsconfig.json

diff --git a/.github/workflows/rebalancer-docker.yml b/.github/workflows/rebalancer-docker.yml
new file mode 100644
index 00000000000..f7d7d0a0339
--- /dev/null
+++ b/.github/workflows/rebalancer-docker.yml
@@ -0,0 +1,134 @@
+name: Build and Push Rebalancer Image to GCR
+on:
+  push:
+    branches: [main]
+    tags:
+      - '**'
+    paths:
+      - 'typescript/rebalancer/**'
+      - 'typescript/sdk/**'
+      - 'typescript/provider-sdk/**'
+      - 'typescript/utils/**'
+      - '.registryrc'
+      - '.github/workflows/rebalancer-docker.yml'
+  pull_request:
+    paths:
+      - 'typescript/rebalancer/**'
+      - 'typescript/sdk/**'
+      - 'typescript/provider-sdk/**'
+      - 'typescript/utils/**'
+      - '.registryrc'
+      - '.github/workflows/rebalancer-docker.yml'
+  workflow_dispatch:
+    inputs:
+      include_arm64:
+        description: 'Include arm64 in the build'
+        required: false
+        default: 'false'
+
+concurrency:
+  group: build-push-rebalancer-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check-env:
+    runs-on: ubuntu-latest
+    outputs:
+      gcloud-service-key: ${{ steps.gcloud-service-key.outputs.defined }}
+    steps:
+      - id: gcloud-service-key
+        env:
+          GCLOUD_SERVICE_KEY: ${{ secrets.GCLOUD_SERVICE_KEY }}
+        if: "${{ env.GCLOUD_SERVICE_KEY != '' }}"
+        run: echo "defined=true" >> $GITHUB_OUTPUT
+
+  build-and-push-to-gcr:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+      pull-requests: write
+
+    needs: [check-env]
+    if: needs.check-env.outputs.gcloud-service-key == 'true'
+
+    steps:
+      - name: Generate GitHub App Token
+        id: generate-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ secrets.HYPER_GONK_APP_ID }}
+          private-key: ${{ secrets.HYPER_GONK_PRIVATE_KEY }}
+
+      - uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          submodules: recursive
+
+      - name: Generate tag data
+        id: taggen
+        run: |
+          echo "TAG_DATE=$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_OUTPUT
+          echo "TAG_SHA=$(echo '${{ github.event.pull_request.head.sha || github.sha }}' | cut -b 1-7)" >> $GITHUB_OUTPUT
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            gcr.io/abacus-labs-dev/hyperlane-rebalancer
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=raw,value=${{ steps.taggen.outputs.TAG_SHA }}-${{ steps.taggen.outputs.TAG_DATE }}
+
+      - name: Set up Depot CLI
+        uses: depot/setup-action@v1
+
+      - name: Login to GCR
+        uses: docker/login-action@v3
+        with:
+          registry: gcr.io
+          username: _json_key
+          password: ${{ secrets.GCLOUD_SERVICE_KEY }}
+
+      - name: Read .registryrc
+        shell: bash
+        run: |
+          REGISTRY_VERSION=$(cat .registryrc)
+          echo "REGISTRY_VERSION=$REGISTRY_VERSION" >> $GITHUB_ENV
+
+      - name: Determine platforms
+        id: determine-platforms
+        run: |
+          if [ "${{ github.event.inputs.include_arm64 }}" == "true" ]; then
+            echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
+          else
+            echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build and push
+        id: build
+        uses: depot/build-push-action@v1
+        with:
+          project: 3cpjhx94qv
+          context: ./
+          file: ./typescript/rebalancer/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            REGISTRY_COMMIT=${{ env.REGISTRY_VERSION }}
+          platforms: ${{ steps.determine-platforms.outputs.platforms }}
+
+      - name: Comment image tags on PR
+        if: github.event_name == 'pull_request' && always()
+        uses: ./.github/actions/docker-image-comment
+        with:
+          comment_tag: rebalancer-docker-image
+          image_name: Rebalancer Docker Image
+          emoji: ♻️
+          image_tags: ${{ steps.meta.outputs.tags }}
+          pr_number: ${{ github.event.pull_request.number }}
+          github_token: ${{ steps.generate-token.outputs.token }}
+          job_status: ${{ job.status }}
diff --git a/Dockerfile b/Dockerfile
index f052c9c7b57..899f5582cb9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,7 @@ COPY typescript/http-registry-server/package.json ./typescript/http-registry-ser
 COPY typescript/infra/package.json ./typescript/infra/
 COPY typescript/provider-sdk/package.json ./typescript/provider-sdk/
 COPY typescript/radix-sdk/package.json ./typescript/radix-sdk/
+COPY typescript/rebalancer/package.json ./typescript/rebalancer/
 COPY typescript/sdk/package.json ./typescript/sdk/
 COPY typescript/tsconfig/package.json ./typescript/tsconfig/
 COPY typescript/utils/package.json ./typescript/utils/
diff --git a/package.json b/package.json
index 3a621d3ad45..d9ca51dcb13 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "starknet"
   ],
   "resolutions": {
+    "zod": "3.21.2",
     "async": "^2.6.4",
     "fetch-ponyfill": "^7.1",
     "flat": "^5.0.2",
diff --git a/solhint-plugin/package.json b/solhint-plugin/package.json
index c0473462ec4..f5c4ffc9c35 100644
--- a/solhint-plugin/package.json
+++ b/solhint-plugin/package.json
@@ -1,7 +1,7 @@
 {
   "name": "solhint-plugin-hyperlane",
   "private": true,
-  "version": "19.9.0",
+  "version": "19.10.0",
   "description": "",
   "license": "Apache-2.0",
   "type": "commonjs",
diff --git a/typescript/ccip-server/package.json b/typescript/ccip-server/package.json
index 6ca394f8b0b..638f0f2249b 100644
--- a/typescript/ccip-server/package.json
+++ b/typescript/ccip-server/package.json
@@ -48,7 +48,7 @@
     "@eth-optimism/sdk": "^3.3.3",
     "@google-cloud/pino-logging-gcp-config": "^1.0.6",
     "@hyperlane-xyz/core": "10.0.4",
-    "@hyperlane-xyz/registry": "20.0.0",
+    "@hyperlane-xyz/registry": "23.6.0",
     "@hyperlane-xyz/sdk": "19.10.0",
     "@hyperlane-xyz/utils": "19.10.0",
     "@prisma/client": "^6.8.2",
@@ -58,7 +58,7 @@
     "express": "^4.17.1",
     "pino-http": "^10.2.0",
     "prisma": "^6.8.2",
-    "prom-client": "^14.0.1",
+    "prom-client": "^15.1.0",
     "zod": "^3.21.2"
   }
 }
diff --git a/typescript/cli/package.json b/typescript/cli/package.json
index 01d43142f7f..1319a7ab420 100644
--- a/typescript/cli/package.json
+++ b/typescript/cli/package.json
@@ -15,7 +15,8 @@
     "@hyperlane-xyz/http-registry-server": "19.10.0",
     "@hyperlane-xyz/provider-sdk": "0.2.0",
     "@hyperlane-xyz/radix-sdk": "19.10.0",
-    "@hyperlane-xyz/registry": "20.0.0",
+    "@hyperlane-xyz/rebalancer": "0.1.0",
+    "@hyperlane-xyz/registry": "23.6.0",
     "@hyperlane-xyz/sdk": "19.10.0",
     "@hyperlane-xyz/tsconfig": "workspace:^",
     "@hyperlane-xyz/utils": "19.10.0",
@@ -49,7 +50,7 @@
     "mocha": "^11.5.0",
     "pino": "^8.19.0",
     "prettier": "^3.5.3",
-    "prom-client": "^14.0.1",
+    "prom-client": "^15.1.0",
     "sinon": "^13.0.2",
     "terminal-link": "^3.0.0",
     "testcontainers": "11.7.0",
diff --git a/typescript/cli/src/commands/warp.ts b/typescript/cli/src/commands/warp.ts
index 2ee9d8ed90f..b732851a431 100644
--- a/typescript/cli/src/commands/warp.ts
+++ b/typescript/cli/src/commands/warp.ts
@@ -2,6 +2,7 @@ import util from 'util';
 import { stringify as yamlStringify } from 'yaml';
 import { CommandModule } from 'yargs';
 
+import { RebalancerConfig, RebalancerService } from '@hyperlane-xyz/rebalancer';
 import {
   RawForkedChainConfigByChain,
   RawForkedChainConfigByChainSchema,
@@ -15,6 +16,7 @@ import {
   difference,
   intersection,
   objFilter,
+  rootLogger,
 } from '@hyperlane-xyz/utils';
 
 import { runWarpRouteCheck } from '../check/warp.js';
@@ -35,7 +37,6 @@ import {
   logGreen,
 } from '../logger.js';
 import { getWarpRouteConfigsByCore, runWarpRouteRead } from '../read/warp.js';
-import { RebalancerRunner } from '../rebalancer/runner.js';
 import { sendTestTransfer } from '../send/transfer.js';
 import { ExtendedChainSubmissionStrategySchema } from '../submitters/types.js';
 import {
@@ -490,18 +491,63 @@ export const rebalancer: CommandModuleWithWriteContext<{
     },
   },
   handler: async (args) => {
-    let runner: RebalancerRunner;
-    try {
-      const { context, ...rest } = args;
-      runner = await RebalancerRunner.create(rest, context);
-    } catch (e: any) {
-      // exit on startup errors
-      errorRed(`Rebalancer startup error: ${util.format(e)}`);
-      process.exit(1);
-    }
+    const {
+      context,
+      config: configPath,
+      checkFrequency,
+      withMetrics,
+      monitorOnly,
+      manual,
+      origin,
+      destination,
+      amount,
+    } = args;
+
+    logCommandHeader('Hyperlane Warp Route Rebalancer');
 
     try {
-      await runner.run();
+      // Load rebalancer configuration
+      const rebalancerConfig = RebalancerConfig.load(configPath);
+
+      // Determine execution mode
+      const mode = manual ? 'manual' : 'daemon';
+
+      // Create rebalancer service
+      const service = new RebalancerService(
+        context.multiProvider,
+        context.multiProtocolProvider,
+        context.registry,
+        rebalancerConfig,
+        {
+          mode,
+          checkFrequency,
+          withMetrics,
+          monitorOnly,
+          coingeckoApiKey: process.env.COINGECKO_API_KEY,
+          logger: rootLogger.child({ module: 'rebalancer' }),
+        },
+      );
+
+      // Execute based on mode
+      if (manual) {
+        if (!origin || !destination || !amount) {
+          errorRed(
+            'Origin, destination, and amount are required for manual rebalance',
+          );
+          process.exit(1);
+        }
+
+        await service.executeManual({
+          origin,
+          destination,
+          amount,
+        });
+
+        logGreen('✅ Manual rebalance completed successfully');
+      } else {
+        // Start daemon mode
+        await service.start();
+      }
     } catch (e: any) {
       errorRed(`Rebalancer error: ${util.format(e)}`);
       process.exit(1);
diff --git a/typescript/cli/src/context/strategies/chain/chainResolver.ts b/typescript/cli/src/context/strategies/chain/chainResolver.ts
index 87ee90673d0..748a6d9225e 100644
--- a/typescript/cli/src/context/strategies/chain/chainResolver.ts
+++ b/typescript/cli/src/context/strategies/chain/chainResolver.ts
@@ -1,3 +1,4 @@
+import { RebalancerConfig } from '@hyperlane-xyz/rebalancer';
 import {
   ChainName,
   DeployedCoreAddresses,
@@ -9,7 +10,6 @@ import { ProtocolType, assert } from '@hyperlane-xyz/utils';
 import { CommandType } from '../../../commands/signCommands.js';
 import { readCoreDeployConfigs } from '../../../config/core.js';
 import { getWarpRouteDeployConfig } from '../../../config/warp.js';
-import { RebalancerConfig } from '../../../rebalancer/config/RebalancerConfig.js';
 import {
   runMultiChainSelectionStep,
   runSingleChainSelectionStep,
diff --git a/typescript/cli/src/rebalancer/README.md b/typescript/cli/src/rebalancer/README.md
deleted file mode 100644
index a375f41da95..00000000000
--- a/typescript/cli/src/rebalancer/README.md
+++ /dev/null
@@ -1,177 +0,0 @@
-# Hyperlane Warp Rebalancer
-
-The Hyperlane Warp Rebalancer is a tool that automatically manages the balance of collateral across chains in a Warp Route. It ensures that each chain maintains an optimal balance of tokens based on the configured strategy.
-
-## Configuration
-
-The rebalancer uses a configuration file that defines both global settings and chain-specific configurations. The configuration file can be in either YAML or JSON format.
-
-The basic structure of the configuration is as follows:
-
-```yaml
-# Required: Unique identifier for the Warp Route. This is used to identify the
-# HypERC20 token that is being rebalanced.
-# The format is <TOKEN>/<LABEL>
-warpRouteId: ...
-
-# Required: The rebalancing strategy and chain-specific configurations
-strategy:
-  # Required: Rebalancing strategy ('weighted' or 'minAmount')
-  rebalanceStrategy: ...
-
-  # Required: Configuration for each chain involved in the rebalancing.
-  # Only chains included here will be considered for rebalancing.
-  chains:
-    <chainName1>:
-      # ... chain-specific config
-    <chainName2>:
-      # ... chain-specific config
-```
-
-Below are examples for each rebalancing strategy.
-
-### Weighted Strategy
-
-This strategy aims to maintain a weighted distribution of tokens across chains.
-
-```yaml
-# Required: Unique identifier for the Warp Route
-warpRouteId: USDC/arbitrumsepolia-modetestnet-optimismsepolia-sepolia
-
-strategy:
-  # Required: Rebalancing strategy ('weighted', 'minAmount')
-  rebalanceStrategy: weighted
-
-  # Chain configurations
-  chains:
-    sepolia:
-      # Required: The address of the bridge for cross-chain transfers
-      bridge: '0x1234...'
-      # Required: Expected time in seconds for a bridge transfer to complete.
-      # This prevents new rebalances while a transfer is in progress.
-      bridgeLockTime: 300 # 5 minutes
-      # Optional: Minimum amount to bridge (in token units). Prevents dust transfers.
-      bridgeMinAcceptedAmount: 1 # 1 USDC
-      # Optional: Set to true if the bridge is another Warp Route.
-      bridgeIsWarp: false
-
-      # Optional: Override configurations for specific destination chains
-      override:
-        arbitrumsepolia: # Chain to override settings for
-          bridge: '0x4321...' # Use a different bridge when sending to this chain
-          bridgeLockTime: 600 # 10 minutes
-          bridgeMinAcceptedAmount: 2 # 2 USDC
-          bridgeIsWarp: true
-
-      # Strategy-specific parameters for 'weighted'
-      weighted:
-        # Required: Relative weight for this chain. If all chains have equal
-        # weight, rebalancing will aim for equal collateral on all chains.
-        weight: 100
-        # Required: Percentage of deviation from the target amount allowed before
-        # a rebalance is triggered (0-100). For a target of 100 USDC, a 5%
-        # tolerance allows the amount to drop to 95 before rebalancing.
-        tolerance: 5
-
-    arbitrumsepolia:
-      bridge: '0xabcd...'
-      bridgeLockTime: 300
-      weighted:
-        weight: 50
-        tolerance: 10
-```
-
-### MinAmount Strategy
-
-This strategy ensures that each chain maintains a minimum amount of tokens. It can be configured in two ways: `absolute` and `relative`.
-
-**Note:** All chains must use the same `minAmount` type (`absolute` or `relative`).
-
-#### Absolute `minAmount`
-
-Uses absolute token amounts for thresholds.
-
-```yaml
-warpRouteId: USDC/arbitrumsepolia-modetestnet-optimismsepolia-sepolia
-strategy:
-  rebalanceStrategy: minAmount
-  chains:
-    sepolia:
-      bridge: '0x1234...'
-      bridgeLockTime: 300
-      minAmount:
-        type: 'absolute'
-        # Required: Minimum amount to maintain on this chain (in token units).
-        min: 100 # 100 USDC
-        # Required: The target amount to rebalance to. Must be > min.
-        target: 110 # 110 USDC
-```
-
-#### Relative `minAmount`
-
-Uses percentages of the total rebalanceable amount for thresholds.
-
-```yaml
-warpRouteId: USDC/arbitrumsepolia-modetestnet-optimismsepolia-sepolia
-strategy:
-  rebalanceStrategy: minAmount
-  chains:
-    sepolia:
-      bridge: '0x1234...'
-      bridgeLockTime: 300
-      minAmount:
-        type: 'relative'
-        # Required: Minimum percentage to maintain (0.0 to 1.0).
-        # 1.0 represents the total collateral of all rebalanceable chains.
-        min: 0.3 # 30%
-        # Required: The target percentage to rebalance to. Must be > min.
-        target: 0.35 # 35%
-```
-
-## Basic Usage
-
-To run the rebalancer, you need to provide:
-
-1. A configuration file
-2. A private key to sign rebalance transactions
-
-```bash
-# Using environment variable for private key
-HYP_KEY=your_private_key hyperlane warp rebalancer --config ./rebalancer-config.yaml
-
-# Using CLI option for private key
-hyperlane warp rebalancer --config ./rebalancer-config.yaml --key your_private_key
-```
-
-### Additional Options
-
-`--checkFrequency`: Frequency to check balances in ms (defaults: 30 seconds)
-
-`--monitorOnly`: Run in monitor-only mode (no transactions will be sent)
-
-`--withMetrics`: Enabled by default. Can provide a COINGECKO_API_KEY environment variable to fetch token prices from CoinGecko.
-
-### Manual Rebalance
-
-A manual rebalance allows you to execute an immediate rebalance. Once the rebalance is executed, the process finishes.
-
-Requires providing the following options to the execution command:
-
-`--manual`: Flag that determines that a one off rebalance should be executed
-
-`--origin`: The origin chain of the rebalance
-
-`--destination`: The destination chain of the rebalance
-
-`--amount`: The amount of tokens to transfer (in token units)
-
-For instance, if you need to move `100` USDC from `sepolia` to `arbitrumsepolia`:
-
-```bash
-hyperlane warp rebalancer \
-  --config ./rebalancer-config.yaml \
-  --manual \
-  --origin sepolia \
-  --destination arbitrumsepolia \
-  --amount 100
-```
diff --git a/typescript/cli/src/rebalancer/config/RebalancerConfig.test.ts b/typescript/cli/src/rebalancer/config/RebalancerConfig.test.ts
deleted file mode 100644
index cb009f427ee..00000000000
--- a/typescript/cli/src/rebalancer/config/RebalancerConfig.test.ts
+++ /dev/null
@@ -1,387 +0,0 @@
-import { expect } from 'chai';
-import { ethers } from 'ethers';
-import { rmSync } from 'fs';
-
-import {
-  RebalancerConfigFileInput,
-  RebalancerMinAmountType,
-  RebalancerStrategyOptions,
-} from '@hyperlane-xyz/sdk';
-
-import { REBALANCER_CONFIG_PATH } from '../../tests/ethereum/consts.js';
-import { writeYamlOrJson } from '../../utils/files.js';
-
-import { RebalancerConfig } from './RebalancerConfig.js';
-
-describe('RebalancerConfig', () => {
-  let data: RebalancerConfigFileInput;
-
-  beforeEach(() => {
-    data = {
-      warpRouteId: 'warpRouteId',
-      strategy: {
-        rebalanceStrategy: RebalancerStrategyOptions.Weighted,
-        chains: {
-          chain1: {
-            weighted: {
-              weight: 100,
-              tolerance: 0,
-            },
-            bridge: ethers.constants.AddressZero,
-            bridgeLockTime: 1,
-          },
-          chain2: {
-            weighted: {
-              weight: 100,
-              tolerance: 0,
-            },
-            bridge: ethers.constants.AddressZero,
-            bridgeLockTime: 1,
-          },
-        },
-      },
-    };
-
-    writeYamlOrJson(REBALANCER_CONFIG_PATH, data);
-  });
-
-  afterEach(() => {
-    rmSync(REBALANCER_CONFIG_PATH, { force: true });
-  });
-
-  it('should throw when the config file does not exist', () => {
-    rmSync(REBALANCER_CONFIG_PATH, { force: true });
-
-    expect(() => RebalancerConfig.load(REBALANCER_CONFIG_PATH)).to.throw(
-      `File doesn't exist at ${REBALANCER_CONFIG_PATH}`,
-    );
-  });
-
-  it('should load config from file', () => {
-    expect(RebalancerConfig.load(REBALANCER_CONFIG_PATH)).to.deep.equal({
-      warpRouteId: 'warpRouteId',
-      strategyConfig: {
-        rebalanceStrategy: RebalancerStrategyOptions.Weighted,
-        chains: {
-          chain1: {
-            weighted: {
-              weight: 100n,
-              tolerance: 0n,
-            },
-            bridge: ethers.constants.AddressZero,
-            bridgeLockTime: 1_000,
-          },
-          chain2: {
-            weighted: {
-              weight: 100n,
-              tolerance: 0n,
-            },
-            bridge: ethers.constants.AddressZero,
-            bridgeLockTime: 1_000,
-          },
-        },
-      },
-    });
-  });
-
-  it('should throw if chains are not configured', () => {
-    data.strategy.chains = {};
-
-    writeYamlOrJson(REBALANCER_CONFIG_PATH, data);
-
-    expect(() => RebalancerConfig.load(REBALANCER_CONFIG_PATH)).to.throw(
-      'No chains configured',
-    );
-  });
-
-  it('should throw if no warp route id is configured', () => {
-    // @ts-ignore
-    delete data.warpRouteId;
-
-    writeYamlOrJson(REBALANCER_CONFIG_PATH, data);
-
-    expect(() => RebalancerConfig.load(REBALANCER_CONFIG_PATH)).to.throw(
-      'Validation error: Required at "warpRouteId"',
-    );
-  });
-
-  it('should load relative params without modifications', () => {
-    data = {
-      warpRouteId: 'warpRouteId',
-      strategy: {
-        rebalanceStrategy: RebalancerStrategyOptions.MinAmount,
-        chains: {
-          chain1: {
-            minAmount: {
-              min: '0.2',
-              target: 0.3,
-              type: RebalancerMinAmountType.Relative,
-            },
-            bridge: ethers.constants.AddressZero,
-            bridgeLockTime: 1,
-          },
-          chain2: {
-            minAmount: {
-              min: '0.2',
-              target: 0.3,
-              type: RebalancerMinAmountType.Relative,
-            },
-            bridge: ethers.constants.AddressZero,
-            bridgeLockTime: 1,
-          },
-        },
-      },
-    };
-
-    writeYamlOrJson(REBALANCER_CONFIG_PATH, data);
-
-    expect(
-      RebalancerConfig.load(REBALANCER_CONFIG_PATH).strategyConfig.chains
-        .chain1,
-    ).to.deep.equal({
-      ...data.strategy.chains.chain1,
-      bridgeLockTime: 1_000,
-    });
-  });
-
-  it('should load absolute params without modifications', () => {
-    data = {
-      warpRouteId: 'warpRouteId',
-      strategy: {
-        rebalanceStrategy: RebalancerStrategyOptions.MinAmount,
-        chains: {
-          chain1: {
-            minAmount: {
-              min: '100000',
-              target: 140000,
-              type: RebalancerMinAmountType.Absolute,
-            },
-            bridge: ethers.constants.AddressZero,
-            bridgeLockTime: 1,
-          },
-          chain2: {
-            minAmount: {
-              min: '100000',
-              target: 140000,
-              type: RebalancerMinAmountType.Absolute,
-            },
-            bridge: ethers.constants.AddressZero,
-            bridgeLockTime: 1,
-          },
-        },
-      },
-    };
-
-    writeYamlOrJson(REBALANCER_CONFIG_PATH, data);
-
-    expect(
-      RebalancerConfig.load(REBALANCER_CONFIG_PATH).strategyConfig.chains
-        .chain1,
-    ).to.deep.equal({
-      ...data.strategy.chains.chain1,
-      bridgeLockTime: 1_000,
-    });
-  });
-
-  describe('override functionality', () => {
-    it('should parse a config with overrides', () => {
-      data = {
-        warpRouteId: 'warpRouteId',
-        strategy: {
-          rebalanceStrategy: RebalancerStrategyOptions.MinAmount,
-          chains: {
-            chain1: {
-              minAmount: {
-                min: 1000,
-                target: 1100,
-                type: RebalancerMinAmountType.Absolute,
-              },
-              bridge: ethers.constants.AddressZero,
-              bridgeLockTime: 1,
-              override: {
-                chain2: {
-                  bridge: '0x1234567890123456789012345678901234567890',
-                },
-              },
-            },
-            chain2: {
-              minAmount: {
-                min: 2000,
-                target: 2200,
-                type: RebalancerMinAmountType.Absolute,
-              },
-              bridge: ethers.constants.AddressZero,
-              bridgeLockTime: 1,
-            },
-            chain3: {
-              minAmount: {
-                min: 3000,
-                target: 3300,
-                type: RebalancerMinAmountType.Absolute,
-              },
-              bridge: ethers.constants.AddressZero,
-              bridgeLockTime: 1,
-            },
-          },
-        },
-      };
-
-      writeYamlOrJson(REBALANCER_CONFIG_PATH, data);
-
-      const config = RebalancerConfig.load(REBALANCER_CONFIG_PATH);
-      expect(config.strategyConfig.chains.chain1).to.have.property('override');
-
-      const override = config.strategyConfig.chains.chain1.override;
-      expect(override).to.not.be.undefined;
-      expect(override).to.have.property('chain2');
-
-      const toChain2Override = override!.chain2;
-      expect(toChain2Override).to.have.property('bridge');
-      expect(toChain2Override.bridge).to.equal(
-        '0x1234567890123456789012345678901234567890',
-      );
-    });
-
-    it('should throw when an override references a non-existent chain', () => {
-      data = {
-        warpRouteId: 'warpRouteId',
-        strategy: {
-          rebalanceStrategy: RebalancerStrategyOptions.MinAmount,
-          chains: {
-            chain1: {
-              minAmount: {
-                min: 1000,
-                target: 1100,
-                type: RebalancerMinAmountType.Absolute,
-              },
-              bridge: ethers.constants.AddressZero,
-              bridgeLockTime: 1,
-              override: {
-                chain2: {
-                  bridge: '0x1234567890123456789012345678901234567890',
-                },
-                chain3: {
-                  bridgeMinAcceptedAmount: 1000,
-                },
-              },
-            },
-            chain2: {
-              minAmount: {
-                min: 2000,
-                target: 2200,
-                type: RebalancerMinAmountType.Absolute,
-              },
-              bridge: ethers.constants.AddressZero,
-              bridgeLockTime: 1,
-            },
-          },
-        },
-      };
-
-      writeYamlOrJson(REBALANCER_CONFIG_PATH, data);
-
-      expect(() => RebalancerConfig.load(REBALANCER_CONFIG_PATH)).to.throw(
-        "Chain 'chain1' has an override for 'chain3', but 'chain3' is not defined in the config",
-      );
-    });
-
-    it('should throw when an override references itself', () => {
-      data = {
-        warpRouteId: 'warpRouteId',
-        strategy: {
-          rebalanceStrategy: RebalancerStrategyOptions.MinAmount,
-          chains: {
-            chain1: {
-              minAmount: {
-                min: 1000,
-                target: 1100,
-                type: RebalancerMinAmountType.Absolute,
-              },
-              bridge: ethers.constants.AddressZero,
-              bridgeLockTime: 1,
-              override: {
-                chain1: {
-                  bridgeMinAcceptedAmount: 1000,
-                },
-              },
-            },
-            chain2: {
-              minAmount: {
-                min: 2000,
-                target: 2200,
-                type: RebalancerMinAmountType.Absolute,
-              },
-              bridge: ethers.constants.AddressZero,
-              bridgeLockTime: 1,
-            },
-          },
-        },
-      };
-
-      writeYamlOrJson(REBALANCER_CONFIG_PATH, data);
-
-      expect(() => RebalancerConfig.load(REBALANCER_CONFIG_PATH)).to.throw(
-        "Chain 'chain1' has an override for 'chain1', but 'chain1' is self-referencing",
-      );
-    });
-
-    it('should allow multiple chain overrides', () => {
-      data.strategy.chains.chain1 = {
-        bridge: ethers.constants.AddressZero,
-        bridgeMinAcceptedAmount: 3000,
-        bridgeLockTime: 1,
-        weighted: {
-          weight: 100,
-          tolerance: 0,
-        },
-        override: {
-          chain2: {
-            bridgeMinAcceptedAmount: 4000,
-          },
-          chain3: {
-            bridge: '0x1234567890123456789012345678901234567890',
-          },
-        },
-      };
-
-      data.strategy.chains.chain2 = {
-        bridge: ethers.constants.AddressZero,
-        bridgeMinAcceptedAmount: 5000,
-        bridgeLockTime: 1,
-        weighted: {
-          weight: 100,
-          tolerance: 0,
-        },
-      };
-
-      data.strategy.chains.chain3 = {
-        bridge: ethers.constants.AddressZero,
-        bridgeMinAcceptedAmount: 6000,
-        bridgeLockTime: 1,
-        weighted: {
-          weight: 100,
-          tolerance: 0,
-        },
-      };
-
-      writeYamlOrJson(REBALANCER_CONFIG_PATH, data);
-
-      const config = RebalancerConfig.load(REBALANCER_CONFIG_PATH);
-
-      const chain1Overrides = config.strategyConfig.chains.chain1.override;
-      expect(chain1Overrides).to.not.be.undefined;
-      expect(chain1Overrides).to.have.property('chain2');
-      expect(chain1Overrides).to.have.property('chain3');
-
-      const chain2Overrides = chain1Overrides!.chain2;
-      expect(chain2Overrides).to.have.property('bridgeMinAcceptedAmount');
-      expect(chain2Overrides.bridgeMinAcceptedAmount).to.equal(4000);
-
-      const chain3Overrides = chain1Overrides!.chain3;
-      expect(chain3Overrides).to.have.property('bridge');
-      expect(chain3Overrides.bridge).to.equal(
-        '0x1234567890123456789012345678901234567890',
-      );
-    });
-  });
-});
diff --git a/typescript/cli/src/rebalancer/core/WithInflightGuard.test.ts b/typescript/cli/src/rebalancer/core/WithInflightGuard.test.ts
deleted file mode 100644
index 15b91717e1c..00000000000
--- a/typescript/cli/src/rebalancer/core/WithInflightGuard.test.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import chai, { expect } from 'chai';
-import chaiAsPromised from 'chai-as-promised';
-import { ethers } from 'ethers';
-import { pino } from 'pino';
-import Sinon from 'sinon';
-
-import { chainMetadata } from '@hyperlane-xyz/registry';
-import { ChainMetadataManager } from '@hyperlane-xyz/sdk';
-
-import { RebalancingRoute } from '../interfaces/IStrategy.js';
-import { MockRebalancer, buildTestConfig } from '../test/helpers.js';
-import { ExplorerClient } from '../utils/ExplorerClient.js';
-
-import { WithInflightGuard } from './WithInflightGuard.js';
-
-chai.use(chaiAsPromised);
-
-const testLogger = pino({ level: 'silent' });
-
-describe('WithInflightGuard', () => {
-  it('forwards empty routes without calling Explorer', async () => {
-    const config = buildTestConfig();
-
-    const rebalancer = new MockRebalancer();
-    const rebalanceSpy = Sinon.spy(rebalancer, 'rebalance');
-
-    const explorer = new ExplorerClient('http://localhost');
-    const explorerSpy = Sinon.stub(explorer, 'hasUndeliveredRebalance');
-
-    const guard = new WithInflightGuard(
-      config,
-      rebalancer,
-      explorer,
-      ethers.Wallet.createRandom().address,
-      new ChainMetadataManager(chainMetadata as any),
-      testLogger,
-    );
-
-    await guard.rebalance([]);
-
-    expect(explorerSpy.called).to.be.false;
-    expect(rebalanceSpy.calledOnce).to.be.true;
-    expect(rebalanceSpy.calledWith([])).to.be.true;
-  });
-
-  it('calls underlying rebalancer when no inflight is detected', async () => {
-    const config = buildTestConfig({}, ['ethereum', 'arbitrum']);
-    const routes: RebalancingRoute[] = [{ origin: 'ethereum' } as any];
-
-    const rebalancer = new MockRebalancer();
-    const rebalanceSpy = Sinon.spy(rebalancer, 'rebalance');
-
-    const explorer = new ExplorerClient('http://localhost');
-    const explorerSpy = Sinon.stub(
-      explorer,
-      'hasUndeliveredRebalance',
-    ).resolves(false);
-
-    const guard = new WithInflightGuard(
-      config,
-      rebalancer,
-      explorer,
-      ethers.Wallet.createRandom().address,
-      new ChainMetadataManager(chainMetadata as any),
-      testLogger,
-    );
-
-    await guard.rebalance(routes);
-
-    expect(explorerSpy.calledOnce).to.be.true;
-    expect(rebalanceSpy.calledOnce).to.be.true;
-    expect(rebalanceSpy.calledWith(routes)).to.be.true;
-  });
-
-  it('skips rebalancing when inflight is detected', async () => {
-    const config = buildTestConfig({}, ['ethereum', 'arbitrum']);
-    const routes: RebalancingRoute[] = [{ origin: 'ethereum' } as any];
-
-    const rebalancer = new MockRebalancer();
-    const rebalanceSpy = Sinon.spy(rebalancer, 'rebalance');
-
-    const explorer = new ExplorerClient('http://localhost');
-    const explorerSpy = Sinon.stub(
-      explorer,
-      'hasUndeliveredRebalance',
-    ).resolves(true);
-
-    const guard = new WithInflightGuard(
-      config,
-      rebalancer,
-      explorer,
-      ethers.Wallet.createRandom().address,
-      new ChainMetadataManager(chainMetadata as any),
-      testLogger,
-    );
-
-    await guard.rebalance(routes);
-
-    expect(explorerSpy.calledOnce).to.be.true;
-    expect(rebalanceSpy.called).to.be.false;
-  });
-
-  it('propagates explorer query error', async () => {
-    const config = buildTestConfig({}, ['ethereum', 'arbitrum']);
-    const routes: RebalancingRoute[] = [{ origin: 'ethereum' } as any];
-
-    const rebalancer = new MockRebalancer();
-    const rebalanceSpy = Sinon.spy(rebalancer, 'rebalance');
-
-    const explorer = new ExplorerClient('http://localhost');
-    const explorerSpy = Sinon.stub(explorer, 'hasUndeliveredRebalance').rejects(
-      new Error('Explorer HTTP 405'),
-    );
-
-    const guard = new WithInflightGuard(
-      config,
-      rebalancer,
-      explorer,
-      ethers.Wallet.createRandom().address,
-      new ChainMetadataManager(chainMetadata as any),
-      testLogger,
-    );
-
-    await expect(guard.rebalance(routes)).to.be.rejectedWith(
-      'Explorer HTTP 405',
-    );
-
-    expect(explorerSpy.calledOnce).to.be.true;
-    expect(rebalanceSpy.called).to.be.false;
-  });
-});
diff --git a/typescript/cli/src/rebalancer/core/WithSemaphore.test.ts b/typescript/cli/src/rebalancer/core/WithSemaphore.test.ts
deleted file mode 100644
index 6536f668537..00000000000
--- a/typescript/cli/src/rebalancer/core/WithSemaphore.test.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import chai, { expect } from 'chai';
-import chaiAsPromised from 'chai-as-promised';
-import { pino } from 'pino';
-import Sinon from 'sinon';
-
-import { RebalancerStrategyOptions } from '@hyperlane-xyz/sdk';
-
-import { RebalancingRoute } from '../interfaces/IStrategy.js';
-import { MockRebalancer, buildTestConfig } from '../test/helpers.js';
-
-import { WithSemaphore } from './WithSemaphore.js';
-
-chai.use(chaiAsPromised);
-
-const testLogger = pino({ level: 'silent' });
-
-describe('WithSemaphore', () => {
-  it('should call the underlying rebalancer', async () => {
-    const config = buildTestConfig();
-
-    const routes = [
-      {
-        origin: 'chain1',
-      } as any as RebalancingRoute,
-    ];
-
-    const rebalancer = new MockRebalancer();
-    const rebalanceSpy = Sinon.spy(rebalancer, 'rebalance');
-    const withSemaphore = new WithSemaphore(config, rebalancer, testLogger);
-    await withSemaphore.rebalance(routes);
-
-    expect(rebalanceSpy.calledOnce).to.be.true;
-    expect(rebalanceSpy.calledWith(routes)).to.be.true;
-  });
-
-  it('should return early if there are no routes', async () => {
-    const config = buildTestConfig();
-
-    const rebalancer = new MockRebalancer();
-    const rebalanceSpy = Sinon.spy(rebalancer, 'rebalance');
-    const withSemaphore = new WithSemaphore(config, rebalancer, testLogger);
-    await withSemaphore.rebalance([]);
-
-    expect(rebalanceSpy.calledOnce).to.be.false;
-  });
-
-  it('should return early if rebalance occurs before waitUntil is reached', async () => {
-    const config = buildTestConfig();
-
-    const routes = [
-      {
-        origin: 'chain1',
-      } as any as RebalancingRoute,
-    ];
-
-    const rebalancer = new MockRebalancer();
-    const rebalanceSpy = Sinon.spy(rebalancer, 'rebalance');
-    const withSemaphore = new WithSemaphore(config, rebalancer, testLogger);
-    await withSemaphore.rebalance(routes);
-
-    expect(rebalanceSpy.calledOnce).to.be.true;
-    expect(rebalanceSpy.calledWith(routes)).to.be.true;
-
-    rebalanceSpy.resetHistory();
-    await withSemaphore.rebalance(routes);
-
-    expect(rebalanceSpy.calledOnce).to.be.false;
-  });
-
-  it('should throw if a chain is missing', async () => {
-    const config = buildTestConfig({
-      strategyConfig: {
-        rebalanceStrategy: RebalancerStrategyOptions.Weighted,
-        chains: {},
-      },
-    });
-
-    const routes = [
-      {
-        origin: 'chain1',
-      } as any as RebalancingRoute,
-    ];
-
-    const rebalancer = new MockRebalancer();
-    const withSemaphore = new WithSemaphore(config, rebalancer, testLogger);
-
-    await expect(withSemaphore.rebalance(routes)).to.be.rejectedWith(
-      `Chain ${routes[0].origin} not found in config`,
-    );
-  });
-
-  it('should not execute if another rebalance is currently executing', async () => {
-    const config = buildTestConfig();
-
-    const routes = [
-      {
-        origin: 'chain1',
-      } as any as RebalancingRoute,
-    ];
-
-    const rebalancer = new MockRebalancer();
-    const rebalanceSpy = Sinon.spy(rebalancer, 'rebalance');
-    const withSemaphore = new WithSemaphore(config, rebalancer, testLogger);
-
-    const rebalancePromise1 = withSemaphore.rebalance(routes);
-    const rebalancePromise2 = withSemaphore.rebalance(routes);
-    await rebalancePromise1;
-    await rebalancePromise2;
-
-    expect(rebalanceSpy.calledOnce).to.be.true;
-  });
-});
diff --git a/typescript/cli/src/rebalancer/index.ts b/typescript/cli/src/rebalancer/index.ts
deleted file mode 100644
index 92456cf83a8..00000000000
--- a/typescript/cli/src/rebalancer/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './interfaces/IRebalancer.js';
-export * from './interfaces/IMonitor.js';
-export * from './interfaces/IStrategy.js';
-export * from './config/RebalancerConfig.js';
-export * from './factories/RebalancerContextFactory.js';
diff --git a/typescript/cli/src/rebalancer/runner.ts b/typescript/cli/src/rebalancer/runner.ts
deleted file mode 100644
index 542dc9d8559..00000000000
--- a/typescript/cli/src/rebalancer/runner.ts
+++ /dev/null
@@ -1,286 +0,0 @@
-import { Logger } from 'pino';
-
-import { Token } from '@hyperlane-xyz/sdk';
-import { assert, createServiceLogger, toWei } from '@hyperlane-xyz/utils';
-
-import type { WriteCommandContext } from '../context/types.js';
-import { ENV } from '../utils/env.js';
-import { VERSION } from '../version.js';
-
-import { RebalancerConfig } from './config/RebalancerConfig.js';
-import { RebalancerContextFactory } from './factories/RebalancerContextFactory.js';
-import {
-  MonitorEvent,
-  MonitorEventType,
-  MonitorPollingError,
-  MonitorStartError,
-} from './interfaces/IMonitor.js';
-import type { IRebalancer } from './interfaces/IRebalancer.js';
-import type { IStrategy } from './interfaces/IStrategy.js';
-import { Metrics } from './metrics/Metrics.js';
-import { Monitor } from './monitor/Monitor.js';
-import { getRawBalances } from './utils/balanceUtils.js';
-
-interface SharedRebalanceArgs {
-  config: string;
-  checkFrequency: number;
-  withMetrics: boolean;
-  monitorOnly: boolean;
-  manual?: boolean;
-}
-
-interface ManualRebalanceArgs {
-  origin: string;
-  destination: string;
-  amount: string;
-}
-
-type RebalancerCliArgs = SharedRebalanceArgs & Partial<ManualRebalanceArgs>;
-
-export class RebalancerRunner {
-  private isExiting = false;
-  private logger: Logger;
-
-  private constructor(
-    private readonly contextFactory: RebalancerContextFactory,
-    private readonly rebalancerConfig: RebalancerConfig,
-    private readonly monitor: Monitor,
-    private readonly strategy: IStrategy,
-    private readonly rebalancer: IRebalancer | undefined,
-    private readonly metrics: Metrics | undefined,
-    private readonly manualArgs: ManualRebalanceArgs | undefined,
-    logger: Logger,
-  ) {
-    this.logger = logger.child({ class: RebalancerRunner.name });
-  }
-
-  private static validateManualArgs(
-    args: RebalancerCliArgs,
-  ): ManualRebalanceArgs {
-    assert(
-      args.origin && args.destination && args.amount,
-      'Origin, destination, and amount are required for a manual run',
-    );
-
-    // Validate amount is a valid number string and greater than 0
-    const amountNum = Number(args.amount);
-    assert(!isNaN(amountNum), 'Amount must be a valid number');
-    assert(amountNum > 0, 'Amount must be greater than 0');
-
-    return {
-      origin: args.origin,
-      destination: args.destination,
-      amount: args.amount,
-    };
-  }
-
-  public static async create(
-    args: RebalancerCliArgs,
-    context: WriteCommandContext,
-  ): Promise<RebalancerRunner> {
-    const { config, checkFrequency, withMetrics, monitorOnly, manual } = args;
-
-    const logger = await createServiceLogger({
-      service: 'rebalancer',
-      version: VERSION || 'unknown',
-    });
-
-    if (manual && monitorOnly) {
-      throw new Error(
-        'Manual mode is not compatible with monitorOnly. Please disable monitorOnly in your config or via the CLI.',
-      );
-    }
-
-    let manualArgs: ManualRebalanceArgs | undefined;
-    if (manual) {
-      manualArgs = RebalancerRunner.validateManualArgs(args);
-    }
-
-    // Load rebalancer config from disk
-    const rebalancerConfig = RebalancerConfig.load(config);
-    logger.info('✅ Loaded rebalancer config');
-
-    // Instantiate the factory used to create the different rebalancer components
-    const contextFactory = await RebalancerContextFactory.create(
-      rebalancerConfig,
-      context,
-      logger,
-    );
-
-    // Instantiates the monitor that will observe the warp route
-    const monitor = contextFactory.createMonitor(checkFrequency);
-
-    // Instantiates the metrics that will publish stats from the monitored data
-    const metrics = withMetrics
-      ? await contextFactory.createMetrics(ENV.COINGECKO_API_KEY)
-      : undefined;
-
-    // Instantiates the strategy that will compute how rebalance routes should be performed
-    const strategy = await contextFactory.createStrategy(metrics);
-
-    // Instantiates the rebalancer in charge of executing the rebalancing transactions
-    const rebalancer = !monitorOnly
-      ? contextFactory.createRebalancer(metrics)
-      : undefined;
-
-    if (monitorOnly) {
-      logger.warn(
-        'Running in monitorOnly mode: no transactions will be executed.',
-      );
-    }
-
-    if (withMetrics) {
-      logger.warn(
-        'Metrics collection has been enabled and will be gathered during execution',
-      );
-    }
-
-    return new RebalancerRunner(
-      contextFactory,
-      rebalancerConfig,
-      monitor,
-      strategy,
-      rebalancer,
-      metrics,
-      manualArgs,
-      logger,
-    );
-  }
-
-  public async run(): Promise<void> {
-    if (this.manualArgs) {
-      await this.runManual();
-    } else {
-      await this.runDaemon();
-    }
-  }
-
-  private async runManual(): Promise<void> {
-    assert(this.manualArgs, 'Manual arguments are not defined for manual run');
-    assert(this.rebalancer, 'Rebalancer should be defined for a manual run.');
-    const { origin, destination, amount } = this.manualArgs;
-
-    this.logger.warn(
-      `Manual rebalance strategy selected. Origin: ${origin}, Destination: ${destination}, Amount: ${amount}`,
-    );
-
-    const warpCore = this.contextFactory.getWarpCore();
-    const originToken = warpCore.tokens.find(
-      (t: Token) => t.chainName === origin,
-    );
-
-    if (!originToken) {
-      this.logger.error(`❌ Origin token not found for chain ${origin}`);
-      throw new Error(`Origin token not found for chain ${origin}`);
-    }
-
-    try {
-      await this.rebalancer.rebalance([
-        {
-          origin,
-          destination,
-          amount: BigInt(toWei(amount, originToken.decimals)),
-        },
-      ]);
-      this.logger.info(
-        `✅ Manual rebalance from ${origin} to ${destination} for amount ${amount} submitted successfully.`,
-      );
-      return;
-    } catch (e: any) {
-      this.logger.error(
-        { err: e },
-        `❌ Manual rebalance from ${origin} to ${destination} failed.`,
-      );
-      throw e;
-    }
-  }
-
-  private async runDaemon(): Promise<void> {
-    // Setup monitor event listeners before starting it.
-    // These handlers deal with events and errors occurring *after* the monitor has successfully started.
-    this.monitor
-      .on(MonitorEventType.TokenInfo, this.onTokenInfo.bind(this))
-      .on(MonitorEventType.Error, this.onMonitorError.bind(this))
-      .on(MonitorEventType.Start, this.onMonitorStart.bind(this));
-
-    // Set up signal handlers for graceful shutdown.
-    process.on('SIGINT', () => this.gracefulShutdown());
-    process.on('SIGTERM', () => this.gracefulShutdown());
-
-    try {
-      await this.monitor.start();
-    } catch (e: any) {
-      this.logger.error({ err: e }, 'Rebalancer startup error:');
-      throw e;
-    }
-  }
-
-  private async onTokenInfo(event: MonitorEvent): Promise<void> {
-    if (this.metrics) {
-      await Promise.all(
-        event.tokensInfo.map((tokenInfo) =>
-          this.metrics!.processToken(tokenInfo),
-        ),
-      );
-    }
-
-    const rawBalances = getRawBalances(
-      Object.keys(this.rebalancerConfig.strategyConfig.chains),
-      event,
-      this.logger,
-    );
-
-    const rebalancingRoutes = this.strategy.getRebalancingRoutes(rawBalances);
-
-    this.rebalancer
-      ?.rebalance(rebalancingRoutes)
-      .then(() => {
-        // On successful rebalance attempt by monitor
-        this.metrics?.recordRebalancerSuccess();
-        this.logger.info('Rebalancer completed a cycle successfully.');
-      })
-      .catch((e: any) => {
-        this.metrics?.recordRebalancerFailure();
-        // This is an operational error, log it but don't stop the monitor.
-        this.logger.error({ err: e }, 'Error while rebalancing:');
-      });
-  }
-
-  private onMonitorError(e: Error): void {
-    if (e instanceof MonitorPollingError) {
-      this.logger.error(e.message);
-      this.metrics?.recordPollingError();
-    } else if (e instanceof MonitorStartError) {
-      this.logger.error(e.message);
-      throw e;
-    } else {
-      this.logger.error(
-        { err: e },
-        'An unexpected error occurred in the monitor:',
-      );
-    }
-  }
-
-  private onMonitorStart(): void {
-    this.logger.info('Rebalancer started successfully 🚀');
-  }
-
-  public stop(): Promise<void> {
-    return this.monitor.stop();
-  }
-
-  public async gracefulShutdown(): Promise<void> {
-    if (this.isExiting) {
-      return;
-    }
-    this.isExiting = true;
-
-    this.logger.info('Gracefully shutting down rebalancer...');
-    await this.stop();
-    // Unregister listeners to prevent them from being called again during shutdown
-    process.removeAllListeners('SIGINT');
-    process.removeAllListeners('SIGTERM');
-    this.logger.info('Rebalancer shutdown complete.');
-    process.exit(0);
-  }
-}
diff --git a/typescript/helloworld/package.json b/typescript/helloworld/package.json
index 109d5324fca..38118595648 100644
--- a/typescript/helloworld/package.json
+++ b/typescript/helloworld/package.json
@@ -4,7 +4,7 @@
   "version": "19.10.0",
   "dependencies": {
     "@hyperlane-xyz/core": "10.0.4",
-    "@hyperlane-xyz/registry": "20.0.0",
+    "@hyperlane-xyz/registry": "23.6.0",
     "@hyperlane-xyz/sdk": "19.10.0",
     "@hyperlane-xyz/utils": "19.10.0",
     "@openzeppelin/contracts": "^4.9.3",
diff --git a/typescript/http-registry-server/package.json b/typescript/http-registry-server/package.json
index 8df3be14cb4..4d9192f452f 100644
--- a/typescript/http-registry-server/package.json
+++ b/typescript/http-registry-server/package.json
@@ -25,7 +25,7 @@
     "test:unit": "mocha --config .mocharc.json './test/**/*.ts' --exit"
   },
   "dependencies": {
-    "@hyperlane-xyz/registry": "20.0.0",
+    "@hyperlane-xyz/registry": "23.6.0",
     "@hyperlane-xyz/sdk": "19.10.0",
     "@hyperlane-xyz/utils": "19.10.0",
     "express": "^5.1.0",
diff --git a/typescript/http-registry-server/src/routes/chain.ts b/typescript/http-registry-server/src/routes/chain.ts
index 6b385420b4a..a8cb1e946b8 100644
--- a/typescript/http-registry-server/src/routes/chain.ts
+++ b/typescript/http-registry-server/src/routes/chain.ts
@@ -1,4 +1,4 @@
-import { Request, Response, Router } from 'express';
+import { type IRouter, Request, Response, Router } from 'express';
 
 import { UpdateChainSchema } from '@hyperlane-xyz/registry';
 import { ZChainName } from '@hyperlane-xyz/sdk';
@@ -10,7 +10,7 @@ import {
 } from '../middleware/validateRequest.js';
 import { ChainService } from '../services/chainService.js';
 
-export function createChainRouter(chainService: ChainService) {
+export function createChainRouter(chainService: ChainService): IRouter {
   const router = Router();
 
   router.get(
diff --git a/typescript/http-registry-server/src/routes/root.ts b/typescript/http-registry-server/src/routes/root.ts
index a53c23fe8ed..13ac3f253eb 100644
--- a/typescript/http-registry-server/src/routes/root.ts
+++ b/typescript/http-registry-server/src/routes/root.ts
@@ -1,11 +1,11 @@
-import { Request, Response, Router } from 'express';
+import { type IRouter, Request, Response, Router } from 'express';
 
 import { WarpRouteFilterSchema } from '@hyperlane-xyz/registry';
 
 import { validateQueryParams } from '../middleware/validateRequest.js';
 import { RootService } from '../services/rootService.js';
 
-export function createRootRouter(rootService: RootService) {
+export function createRootRouter(rootService: RootService): IRouter {
   const router = Router();
 
   // get metadata
diff --git a/typescript/http-registry-server/src/routes/warp.ts b/typescript/http-registry-server/src/routes/warp.ts
index ca0efce17f7..c9bb8c02555 100644
--- a/typescript/http-registry-server/src/routes/warp.ts
+++ b/typescript/http-registry-server/src/routes/warp.ts
@@ -1,4 +1,4 @@
-import { Request, Response, Router } from 'express';
+import { type IRouter, Request, Response, Router } from 'express';
 import { z } from 'zod';
 
 import { WarpRouteFilterSchema } from '@hyperlane-xyz/registry';
@@ -10,7 +10,7 @@ import {
 } from '../middleware/validateRequest.js';
 import { WarpService } from '../services/warpService.js';
 
-export function createWarpRouter(warpService: WarpService) {
+export function createWarpRouter(warpService: WarpService): IRouter {
   const router = Router();
 
   // get warp deploy config
diff --git a/typescript/infra/helm/rebalancer/templates/_helpers.tpl b/typescript/infra/helm/rebalancer/templates/_helpers.tpl
index 57d8061edec..ab6a4899b69 100644
--- a/typescript/infra/helm/rebalancer/templates/_helpers.tpl
+++ b/typescript/infra/helm/rebalancer/templates/_helpers.tpl
@@ -74,27 +74,26 @@ The rebalancer container
     value: "true"
   - name: LOG_FORMAT
     value: json
+  - name: LOG_LEVEL
+    value: info
   - name: REGISTRY_COMMIT
     value: {{ .Values.hyperlane.registryCommit }}
   - name: HYP_KEY
     value: $(REBALANCER_KEY)
   - name: COINGECKO_API_KEY
     value: $(COINGECKO_API_KEY)
+  - name: REBALANCER_CONFIG_FILE
+    value: "{{ .Values.hyperlane.rebalancerConfigFile }}"
+  - name: CHECK_FREQUENCY
+    value: "60000"
+  - name: WITH_METRICS
+    value: "true"
+  - name: MONITOR_ONLY
+    value: "false"
+  command:
+  - "node"
   args:
-  - "yarn"
-  - "workspace"
-  - "@hyperlane-xyz/cli"
-  - "hyperlane"
-  - "warp"
-  - "rebalancer"
-  - "--checkFrequency"
-  - "60000"
-  - "--withMetrics"
-  - "true"
-  - "--configFile"
-  - "{{ .Values.hyperlane.rebalancerConfigFile }}"
-  - "--registry"
-  - "/hyperlane-registry"
+  - "typescript/rebalancer/dist/service.js"
   envFrom:
   - secretRef:
       name: {{ include "hyperlane.fullname" . }}-secret
diff --git a/typescript/infra/helm/rebalancer/values.yaml b/typescript/infra/helm/rebalancer/values.yaml
index 34c48355144..485bf00755c 100644
--- a/typescript/infra/helm/rebalancer/values.yaml
+++ b/typescript/infra/helm/rebalancer/values.yaml
@@ -1,5 +1,5 @@
 image:
-  repository: gcr.io/abacus-labs-dev/hyperlane-monorepo
+  repository: gcr.io/abacus-labs-dev/hyperlane-rebalancer
   tag:
 hyperlane:
   runEnv:
diff --git a/typescript/infra/package.json b/typescript/infra/package.json
index 9e730b33bfa..981680d6fa4 100644
--- a/typescript/infra/package.json
+++ b/typescript/infra/package.json
@@ -18,7 +18,7 @@
     "@hyperlane-xyz/core": "10.0.4",
     "@hyperlane-xyz/helloworld": "19.10.0",
     "@hyperlane-xyz/http-registry-server": "19.10.0",
-    "@hyperlane-xyz/registry": "20.0.0",
+    "@hyperlane-xyz/registry": "23.6.0",
     "@hyperlane-xyz/sdk": "19.10.0",
     "@hyperlane-xyz/utils": "19.10.0",
     "@inquirer/prompts": "3.3.2",
@@ -38,7 +38,7 @@
     "dotenv": "^10.0.0",
     "json-stable-stringify": "^1.1.1",
     "postgres": "^3.4.5",
-    "prom-client": "^14.0.1",
+    "prom-client": "^15.1.0",
     "prompts": "^2.4.2",
     "tmp": "^0.2.3",
     "yaml": "2.4.5",
@@ -83,6 +83,7 @@
   ],
   "license": "Apache-2.0",
   "type": "module",
+  "prepublish": "yarn build",
   "repository": "https://github.com/hyperlane-xyz/hyperlane-monorepo",
   "scripts": {
     "start:http-registry": "tsx scripts/http-registry.ts",
diff --git a/typescript/infra/src/utils/metrics.ts b/typescript/infra/src/utils/metrics.ts
index a9f274caa2e..4335c9f04e4 100644
--- a/typescript/infra/src/utils/metrics.ts
+++ b/typescript/infra/src/utils/metrics.ts
@@ -1,12 +1,14 @@
 import http from 'http';
-import { Gauge, Pushgateway, Registry } from 'prom-client';
+import { Gauge, Pushgateway, Registry, RegistryContentType } from 'prom-client';
 import { format } from 'util';
 
 import { rootLogger } from '@hyperlane-xyz/utils';
 
 const logger = rootLogger.child({ module: 'metrics' });
 
-function getPushGateway(register: Registry): Pushgateway | null {
+function getPushGateway(
+  register: Registry,
+): Pushgateway<RegistryContentType> | null {
   const gatewayAddr = process.env['PROMETHEUS_PUSH_GATEWAY'];
   if (gatewayAddr) {
     return new Pushgateway(gatewayAddr, [], register);
diff --git a/typescript/rebalancer/.gitignore b/typescript/rebalancer/.gitignore
new file mode 100644
index 00000000000..f85021fc8a3
--- /dev/null
+++ b/typescript/rebalancer/.gitignore
@@ -0,0 +1,3 @@
+.env
+dist
+cache
diff --git a/typescript/rebalancer/.mocharc.json b/typescript/rebalancer/.mocharc.json
new file mode 100644
index 00000000000..2a414eb587f
--- /dev/null
+++ b/typescript/rebalancer/.mocharc.json
@@ -0,0 +1,3 @@
+{
+  "import": ["tsx"]
+}
diff --git a/typescript/rebalancer/Dockerfile b/typescript/rebalancer/Dockerfile
new file mode 100644
index 00000000000..20878e7a156
--- /dev/null
+++ b/typescript/rebalancer/Dockerfile
@@ -0,0 +1,89 @@
+FROM node:20-alpine AS builder
+
+WORKDIR /hyperlane-monorepo
+
+RUN apk add --update --no-cache git g++ make py3-pip jq bash curl && \
+    yarn set version 4.5.1
+
+# Copy package.json and yarn config
+COPY package.json yarn.lock .yarnrc.yml ./
+COPY .yarn/plugins ./.yarn/plugins
+COPY .yarn/releases ./.yarn/releases
+COPY .yarn/patches ./.yarn/patches
+
+# Copy only the packages needed for rebalancer
+COPY typescript/rebalancer/package.json ./typescript/rebalancer/
+COPY typescript/deploy-sdk/package.json ./typescript/deploy-sdk/
+COPY typescript/sdk/package.json ./typescript/sdk/
+COPY typescript/provider-sdk/package.json ./typescript/provider-sdk/
+COPY typescript/utils/package.json ./typescript/utils/
+COPY typescript/cosmos-sdk/package.json ./typescript/cosmos-sdk/
+COPY typescript/cosmos-types/package.json ./typescript/cosmos-types/
+COPY typescript/radix-sdk/package.json ./typescript/radix-sdk/
+COPY typescript/tsconfig/package.json ./typescript/tsconfig/
+COPY typescript/eslint-config/package.json ./typescript/eslint-config/
+COPY solidity/package.json ./solidity/
+COPY solhint-plugin/package.json ./solhint-plugin/
+COPY starknet/package.json ./starknet/
+
+RUN yarn install && yarn cache clean
+
+# Copy source files
+COPY turbo.json ./
+COPY typescript/rebalancer ./typescript/rebalancer
+COPY typescript/deploy-sdk ./typescript/deploy-sdk
+COPY typescript/sdk ./typescript/sdk
+COPY typescript/provider-sdk ./typescript/provider-sdk
+COPY typescript/utils ./typescript/utils
+COPY typescript/cosmos-sdk ./typescript/cosmos-sdk
+COPY typescript/cosmos-types ./typescript/cosmos-types
+COPY typescript/radix-sdk ./typescript/radix-sdk
+COPY typescript/tsconfig ./typescript/tsconfig
+COPY typescript/eslint-config ./typescript/eslint-config
+COPY solidity ./solidity
+COPY solhint-plugin ./solhint-plugin
+COPY starknet ./starknet
+
+# Build only the rebalancer and its dependencies
+RUN yarn turbo run build --filter=@hyperlane-xyz/rebalancer...
+
+# Production stage
+FROM node:20-alpine AS runner
+
+WORKDIR /hyperlane-monorepo
+
+RUN apk add --update --no-cache git jq bash curl
+
+# Copy built artifacts and node_modules
+COPY --from=builder /hyperlane-monorepo/package.json ./
+COPY --from=builder /hyperlane-monorepo/yarn.lock ./
+COPY --from=builder /hyperlane-monorepo/.yarnrc.yml ./
+COPY --from=builder /hyperlane-monorepo/.yarn ./.yarn
+COPY --from=builder /hyperlane-monorepo/node_modules ./node_modules
+COPY --from=builder /hyperlane-monorepo/typescript/rebalancer ./typescript/rebalancer
+COPY --from=builder /hyperlane-monorepo/typescript/deploy-sdk ./typescript/deploy-sdk
+COPY --from=builder /hyperlane-monorepo/typescript/sdk ./typescript/sdk
+COPY --from=builder /hyperlane-monorepo/typescript/provider-sdk ./typescript/provider-sdk
+COPY --from=builder /hyperlane-monorepo/typescript/utils ./typescript/utils
+COPY --from=builder /hyperlane-monorepo/typescript/cosmos-sdk ./typescript/cosmos-sdk
+COPY --from=builder /hyperlane-monorepo/typescript/cosmos-types ./typescript/cosmos-types
+COPY --from=builder /hyperlane-monorepo/typescript/radix-sdk ./typescript/radix-sdk
+COPY --from=builder /hyperlane-monorepo/typescript/tsconfig ./typescript/tsconfig
+
+# Baked-in registry version
+ENV REGISTRY_URI="/hyperlane-registry"
+ARG REGISTRY_COMMIT="main"
+RUN git clone https://github.com/hyperlane-xyz/hyperlane-registry.git "$REGISTRY_URI" \
+    && cd "$REGISTRY_URI" \
+    && git fetch origin "$REGISTRY_COMMIT" \
+    && git checkout "$REGISTRY_COMMIT"
+
+# Environment variables
+ENV NODE_ENV=production
+ENV LOG_LEVEL=info
+
+# Expose metrics port
+EXPOSE 9090
+
+# Run the rebalancer service
+CMD ["node", "typescript/rebalancer/dist/service.js"]
diff --git a/typescript/rebalancer/README.md b/typescript/rebalancer/README.md
new file mode 100644
index 00000000000..d13013115de
--- /dev/null
+++ b/typescript/rebalancer/README.md
@@ -0,0 +1,257 @@
+# @hyperlane-xyz/rebalancer
+
+Hyperlane Warp Route Collateral Rebalancer Service - maintains optimal collateral distribution across chains for Hyperlane warp routes.
+
+## Overview
+
+The rebalancer monitors collateral balances across warp route deployments and automatically transfers tokens between chains to maintain configured target balances. It supports both manual one-off rebalances and continuous daemon mode for production deployments.
+
+## Features
+
+- **Multi-Protocol Support**: Protocol-agnostic design supporting EVM chains (Cosmos, Sealevel, etc. when movable collateral contracts available)
+- **Flexible Strategies**: Weighted and minimum-amount rebalancing strategies
+- **Safety Features**: Inflight guards, semaphores, and comprehensive validation
+- **Observability**: Built-in Prometheus metrics and structured logging
+- **Dual Mode**: Manual CLI execution or continuous daemon service
+- **Bridge Support**: Integration with Portal, Hyperlane, and other bridge providers
+
+## Installation
+
+```bash
+# From monorepo root
+yarn install
+
+# Build the package
+yarn workspace @hyperlane-xyz/rebalancer build
+```
+
+## Usage
+
+### Manual Rebalancing (CLI)
+
+Execute a one-off rebalance using the CLI:
+
+```bash
+# Via CLI package
+yarn workspace @hyperlane-xyz/cli hyperlane warp rebalancer \
+  --config /path/to/rebalancer-config.yaml \
+  --manual \
+  --origin ethereum \
+  --destination arbitrum \
+  --amount 1000
+```
+
+### Daemon Mode (Service)
+
+Run as a continuous service (typically in K8s):
+
+```bash
+# Set environment variables
+export REBALANCER_CONFIG_FILE=/path/to/rebalancer-config.yaml
+export HYP_KEY=your_private_key
+export COINGECKO_API_KEY=your_api_key
+
+# Start the service
+yarn workspace @hyperlane-xyz/rebalancer start
+
+# Or with direct node
+node dist/service.js
+```
+
+### Programmatic Usage
+
+```typescript
+import { RebalancerService } from '@hyperlane-xyz/rebalancer';
+
+const service = new RebalancerService(multiProvider, rebalancerConfig, {
+  mode: 'daemon',
+  checkFrequency: 60_000,
+  withMetrics: true,
+  signer: privateKey,
+  logger: console,
+});
+
+// Start daemon
+await service.start();
+
+// Or execute manual rebalance
+await service.executeManual({
+  origin: 'ethereum',
+  destination: 'arbitrum',
+  amount: '1000',
+});
+```
+
+## Configuration
+
+The rebalancer uses a YAML configuration file. See example:
+
+```yaml
+warpRouteId: ETH
+strategy:
+  type: weighted
+  weightsConfig:
+    - chain: ethereum
+      weight: 60
+    - chain: arbitrum
+      weight: 20
+    - chain: optimism
+      weight: 20
+
+chains:
+  ethereum:
+    minBalance: '1000000000000000000' # 1 ETH
+    desiredBalance: '10000000000000000000' # 10 ETH
+    bridgeName: hyperlane
+  arbitrum:
+    minBalance: '500000000000000000' # 0.5 ETH
+    desiredBalance: '5000000000000000000' # 5 ETH
+    bridgeName: hyperlane
+  optimism:
+    minBalance: '500000000000000000'
+    desiredBalance: '5000000000000000000'
+    bridgeName: portal
+    portalConfiguration:
+      originCircleDomain: 0
+      destinationCircleDomain: 6
+```
+
+## Architecture
+
+### Package Structure
+
+```
+typescript/rebalancer/
+├── src/
+│   ├── core/
+│   │   ├── RebalancerService.ts    # Main orchestrator
+│   │   ├── Rebalancer.ts           # Core rebalancing logic
+│   │   ├── WithInflightGuard.ts    # Concurrency protection
+│   │   └── WithSemaphore.ts        # Semaphore wrapper
+│   ├── strategy/
+│   │   ├── WeightedStrategy.ts     # Weighted distribution
+│   │   ├── MinAmountStrategy.ts    # Minimum threshold strategy
+│   │   └── validators/             # Bridge-specific validation
+│   ├── monitor/
+│   │   ├── Monitor.ts              # Balance monitoring
+│   │   └── events.ts               # Event types
+│   ├── metrics/
+│   │   ├── PrometheusMetrics.ts    # Metrics collection
+│   │   └── server.ts               # HTTP metrics endpoint
+│   ├── config/
+│   │   ├── RebalancerConfig.ts     # Config loading/validation
+│   │   └── schemas.ts              # Zod schemas
+│   ├── utils/
+│   │   ├── bridgeUtils.ts          # Bridge helpers
+│   │   ├── balanceUtils.ts         # Balance calculations
+│   │   └── tokenUtils.ts           # Token operations
+│   ├── interfaces/
+│   │   └── IRebalancerAdapter.ts   # Protocol adapter interface
+│   ├── service.ts                  # Service entry point
+│   └── index.ts                    # Public API
+```
+
+### Dependencies
+
+- `@hyperlane-xyz/sdk`: Core SDK with MultiProvider and WarpCore
+- `@hyperlane-xyz/provider-sdk`: Protocol-agnostic provider abstractions
+- `@hyperlane-xyz/utils`: Shared utilities and types
+- `prom-client`: Prometheus metrics
+- `express`: HTTP server for metrics endpoint
+- `pino`: Structured logging
+
+### Multi-Protocol Design
+
+The rebalancer is designed to be protocol-agnostic:
+
+- Uses `IRebalancerAdapter` interface for protocol-specific operations
+- Currently implements `EvmMovableCollateralAdapter` for EVM chains
+- Ready to support AltVM chains when movable collateral contracts are available
+- Leverages `MultiProtocolProvider` for chain interactions
+
+## Deployment
+
+### Kubernetes
+
+The service is deployed as a StatefulSet in production:
+
+```yaml
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: rebalancer
+spec:
+  serviceName: rebalancer
+  replicas: 1
+  template:
+    spec:
+      containers:
+        - name: rebalancer
+          image: gcr.io/abacus-labs-dev/hyperlane-monorepo:latest
+          command: ['node']
+          args: ['typescript/rebalancer/dist/service.js']
+          env:
+            - name: REBALANCER_CONFIG_FILE
+              value: /config/rebalancer-config.yaml
+            - name: HYP_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: rebalancer-secrets
+                  key: private-key
+          volumeMounts:
+            - name: config
+              mountPath: /config
+```
+
+### Monitoring
+
+Prometheus metrics exposed on port 9090:
+
+- `hyperlane_rebalancer_balance_total`: Current balances per chain
+- `hyperlane_rebalancer_rebalance_attempts_total`: Rebalance attempt counter
+- `hyperlane_rebalancer_rebalance_success_total`: Successful rebalances
+- `hyperlane_rebalancer_rebalance_failure_total`: Failed rebalances
+- `hyperlane_rebalancer_transaction_duration_seconds`: Transaction duration histogram
+
+## Development
+
+### Running Tests
+
+```bash
+yarn workspace @hyperlane-xyz/rebalancer test
+```
+
+### Local Development
+
+```bash
+# Watch mode
+yarn workspace @hyperlane-xyz/rebalancer dev
+
+# Start with test config
+HYP_KEY=your_test_key \
+REBALANCER_CONFIG_FILE=./test-config.yaml \
+yarn workspace @hyperlane-xyz/rebalancer start:dev
+```
+
+### Debugging
+
+Enable debug logging:
+
+```bash
+export LOG_LEVEL=debug
+yarn workspace @hyperlane-xyz/rebalancer start
+```
+
+## Migration from CLI
+
+This package replaces the rebalancer functionality previously embedded in `@hyperlane-xyz/cli`. Key changes:
+
+1. **Dedicated Package**: Now a standalone service package
+2. **Direct Entry Point**: K8s deployments use `service.ts` directly (no CLI wrapper)
+3. **Metrics Included**: Prometheus metrics stay with the service
+4. **Protocol-Agnostic**: Aligned with multi-VM architecture
+5. **Dual Mode Support**: Single codebase for both manual and daemon modes
+
+## License
+
+Apache-2.0
diff --git a/typescript/rebalancer/eslint.config.mjs b/typescript/rebalancer/eslint.config.mjs
new file mode 100644
index 00000000000..668fba060a0
--- /dev/null
+++ b/typescript/rebalancer/eslint.config.mjs
@@ -0,0 +1,14 @@
+import MonorepoDefaults from '../../eslint.config.mjs';
+
+export default [
+  ...MonorepoDefaults,
+  {
+    files: ['./src/**/*.ts'],
+  },
+  {
+    rules: {
+      // Disable restricted imports for Node.js built-ins since rebalancer is a Node.js-only service
+      'no-restricted-imports': ['off'],
+    },
+  },
+];
diff --git a/typescript/rebalancer/package.json b/typescript/rebalancer/package.json
new file mode 100644
index 00000000000..6d82a017ca5
--- /dev/null
+++ b/typescript/rebalancer/package.json
@@ -0,0 +1,70 @@
+{
+  "name": "@hyperlane-xyz/rebalancer",
+  "version": "0.1.0",
+  "description": "Hyperlane Warp Route Collateral Rebalancer Service",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "bin": {
+    "hyperlane-rebalancer": "./dist/service.js"
+  },
+  "files": [
+    "dist",
+    "src"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "clean": "rm -rf dist cache",
+    "dev": "tsc --watch",
+    "lint": "eslint -c ./eslint.config.mjs ./src",
+    "prettier": "prettier --write ./src",
+    "test": "mocha --config .mocharc.json './src/**/*.test.ts' --exit",
+    "test:ci": "yarn test",
+    "start": "node dist/service.js",
+    "start:dev": "tsx src/service.ts"
+  },
+  "dependencies": {
+    "@google-cloud/pino-logging-gcp-config": "^1.0.6",
+    "@hyperlane-xyz/core": "10.0.4",
+    "@hyperlane-xyz/provider-sdk": "0.2.0",
+    "@hyperlane-xyz/registry": "23.6.0",
+    "@hyperlane-xyz/sdk": "19.10.0",
+    "@hyperlane-xyz/utils": "19.10.0",
+    "@inquirer/prompts": "3.3.2",
+    "@inquirer/select": "^1.3.3",
+    "bignumber.js": "^9.1.1",
+    "ethers": "^5.8.0",
+    "express": "^5.1.0",
+    "pino": "^8.19.0",
+    "pino-pretty": "^13.0.0",
+    "prom-client": "^15.1.0",
+    "yaml": "2.4.5",
+    "zod": "^3.21.2",
+    "zod-validation-error": "^3.3.0"
+  },
+  "devDependencies": {
+    "@types/express": "^5.0.3",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.14.5",
+    "chai": "^4.5.0",
+    "eslint": "^9.31.0",
+    "mocha": "^11.5.0",
+    "prettier": "^3.5.3",
+    "tsx": "^4.19.1",
+    "typescript": "5.3.3"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "repository": "https://github.com/hyperlane-xyz/hyperlane-monorepo",
+  "keywords": [
+    "hyperlane",
+    "rebalancer",
+    "warp-route",
+    "collateral",
+    "blockchain",
+    "interchain"
+  ],
+  "author": "Abacus Works, Inc.",
+  "license": "Apache-2.0"
+}
diff --git a/typescript/cli/src/rebalancer/config/RebalancerConfig.ts b/typescript/rebalancer/src/config/RebalancerConfig.ts
similarity index 94%
rename from typescript/cli/src/rebalancer/config/RebalancerConfig.ts
rename to typescript/rebalancer/src/config/RebalancerConfig.ts
index 4fc156b20bd..bc65f2377a8 100644
--- a/typescript/cli/src/rebalancer/config/RebalancerConfig.ts
+++ b/typescript/rebalancer/src/config/RebalancerConfig.ts
@@ -7,7 +7,7 @@ import {
 } from '@hyperlane-xyz/sdk';
 import { isObjEmpty } from '@hyperlane-xyz/utils';
 
-import { readYamlOrJson } from '../../utils/files.js';
+import { readYamlOrJson } from '../utils/files.js';
 
 export class RebalancerConfig {
   constructor(
diff --git a/typescript/cli/src/rebalancer/core/Rebalancer.ts b/typescript/rebalancer/src/core/Rebalancer.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/core/Rebalancer.ts
rename to typescript/rebalancer/src/core/Rebalancer.ts
diff --git a/typescript/rebalancer/src/core/RebalancerService.ts b/typescript/rebalancer/src/core/RebalancerService.ts
new file mode 100644
index 00000000000..9fec2874bfc
--- /dev/null
+++ b/typescript/rebalancer/src/core/RebalancerService.ts
@@ -0,0 +1,333 @@
+import { Logger } from 'pino';
+
+import { IRegistry } from '@hyperlane-xyz/registry';
+import {
+  type MultiProtocolProvider,
+  type MultiProvider,
+  Token,
+} from '@hyperlane-xyz/sdk';
+import { assert, toWei } from '@hyperlane-xyz/utils';
+
+import { RebalancerConfig } from '../config/RebalancerConfig.js';
+import { RebalancerContextFactory } from '../factories/RebalancerContextFactory.js';
+import {
+  MonitorEvent,
+  MonitorEventType,
+  MonitorPollingError,
+  MonitorStartError,
+} from '../interfaces/IMonitor.js';
+import type { IRebalancer } from '../interfaces/IRebalancer.js';
+import type { IStrategy } from '../interfaces/IStrategy.js';
+import { Metrics } from '../metrics/Metrics.js';
+import { Monitor } from '../monitor/Monitor.js';
+import { getRawBalances } from '../utils/balanceUtils.js';
+
+export interface RebalancerServiceConfig {
+  /** Execution mode: 'manual' for one-off execution, 'daemon' for continuous monitoring */
+  mode: 'manual' | 'daemon';
+
+  /** Frequency to check balances in milliseconds (daemon mode only) */
+  checkFrequency?: number;
+
+  /** Enable monitor-only mode (no transactions executed) */
+  monitorOnly?: boolean;
+
+  /** Enable Prometheus metrics collection */
+  withMetrics?: boolean;
+
+  /** CoinGecko API key for token price fetching (required for metrics) */
+  coingeckoApiKey?: string;
+
+  /** Logger instance */
+  logger: Logger;
+
+  /** Service version for logging */
+  version?: string;
+}
+
+export interface ManualRebalanceRequest {
+  origin: string;
+  destination: string;
+  amount: string;
+}
+
+/**
+ * RebalancerService is the main orchestrator for the Hyperlane Warp Route Rebalancer.
+ * It supports both manual one-off rebalances and continuous daemon mode.
+ *
+ * @example Manual execution
+ * ```typescript
+ * const service = new RebalancerService(
+ *   multiProvider,
+ *   multiProtocolProvider,
+ *   registry,
+ *   rebalancerConfig,
+ *   {
+ *     mode: 'manual',
+ *     logger: console,
+ *   }
+ * );
+ * await service.executeManual({
+ *   origin: 'ethereum',
+ *   destination: 'arbitrum',
+ *   amount: '1000',
+ * });
+ * ```
+ *
+ * @example Daemon mode
+ * ```typescript
+ * const service = new RebalancerService(
+ *   multiProvider,
+ *   multiProtocolProvider,
+ *   registry,
+ *   rebalancerConfig,
+ *   {
+ *     mode: 'daemon',
+ *     checkFrequency: 60_000,
+ *     withMetrics: true,
+ *     coingeckoApiKey: process.env.COINGECKO_API_KEY,
+ *     logger: console,
+ *   }
+ * );
+ * await service.start();
+ * ```
+ */
+export class RebalancerService {
+  private isExiting = false;
+  private logger: Logger;
+  private contextFactory?: RebalancerContextFactory;
+  private monitor?: Monitor;
+  private strategy?: IStrategy;
+  private rebalancer?: IRebalancer;
+  private metrics?: Metrics;
+  private mode: 'manual' | 'daemon';
+
+  constructor(
+    private readonly multiProvider: MultiProvider,
+    private readonly multiProtocolProvider: MultiProtocolProvider | undefined,
+    private readonly registry: IRegistry,
+    private readonly rebalancerConfig: RebalancerConfig,
+    private readonly config: RebalancerServiceConfig,
+  ) {
+    this.logger = config.logger;
+    this.mode = config.mode;
+  }
+
+  /**
+   * Initialize the service components
+   */
+  private async initialize(): Promise<void> {
+    if (this.contextFactory) {
+      // Already initialized
+      return;
+    }
+
+    this.logger.info('Initializing RebalancerService...');
+
+    // Create context factory
+    this.contextFactory = await RebalancerContextFactory.create(
+      this.rebalancerConfig,
+      this.multiProvider,
+      this.multiProtocolProvider,
+      this.registry,
+      this.logger,
+    );
+
+    // Create monitor (always needed for daemon mode)
+    if (this.mode === 'daemon') {
+      const checkFrequency = this.config.checkFrequency ?? 60_000;
+      this.monitor = this.contextFactory.createMonitor(checkFrequency);
+    }
+
+    // Create metrics if enabled
+    if (this.config.withMetrics) {
+      this.metrics = await this.contextFactory.createMetrics(
+        this.config.coingeckoApiKey,
+      );
+      this.logger.info('Metrics collection enabled');
+    }
+
+    // Create strategy
+    this.strategy = await this.contextFactory.createStrategy(this.metrics);
+
+    // Create rebalancer (unless in monitor-only mode)
+    if (!this.config.monitorOnly) {
+      this.rebalancer = this.contextFactory.createRebalancer(this.metrics);
+    } else {
+      this.logger.warn(
+        'Running in monitorOnly mode: no transactions will be executed.',
+      );
+    }
+
+    this.logger.info('✅ RebalancerService initialized successfully');
+  }
+
+  /**
+   * Execute a manual one-off rebalance
+   */
+  async executeManual(request: ManualRebalanceRequest): Promise<void> {
+    await this.initialize();
+
+    assert(
+      this.rebalancer,
+      'Rebalancer not available. MonitorOnly mode cannot execute manual rebalances.',
+    );
+
+    const { origin, destination, amount } = request;
+
+    this.logger.info(
+      `Manual rebalance strategy selected. Origin: ${origin}, Destination: ${destination}, Amount: ${amount}`,
+    );
+
+    const warpCore = this.contextFactory!.getWarpCore();
+    const originToken = warpCore.tokens.find(
+      (t: Token) => t.chainName === origin,
+    );
+
+    if (!originToken) {
+      const error = `Origin token not found for chain ${origin}`;
+      this.logger.error(error);
+      throw new Error(error);
+    }
+
+    // Validate amount
+    const amountNum = Number(amount);
+    assert(!isNaN(amountNum), 'Amount must be a valid number');
+    assert(amountNum > 0, 'Amount must be greater than 0');
+
+    try {
+      await this.rebalancer.rebalance([
+        {
+          origin,
+          destination,
+          amount: BigInt(toWei(amount, originToken.decimals)),
+        },
+      ]);
+      this.logger.info(
+        `✅ Manual rebalance from ${origin} to ${destination} for amount ${amount} submitted successfully.`,
+      );
+    } catch (error) {
+      this.logger.error(
+        { error },
+        `❌ Manual rebalance from ${origin} to ${destination} failed`,
+      );
+      throw error;
+    }
+  }
+
+  /**
+   * Start the rebalancer in daemon mode (continuous monitoring)
+   */
+  async start(): Promise<void> {
+    if (this.mode !== 'daemon') {
+      throw new Error('start() can only be called in daemon mode');
+    }
+
+    await this.initialize();
+
+    assert(this.monitor, 'Monitor must be initialized for daemon mode');
+
+    // Setup monitor event listeners
+    this.monitor
+      .on(MonitorEventType.TokenInfo, this.onTokenInfo.bind(this))
+      .on(MonitorEventType.Error, this.onMonitorError.bind(this))
+      .on(MonitorEventType.Start, this.onMonitorStart.bind(this));
+
+    // Set up signal handlers for graceful shutdown
+    process.on('SIGINT', () => this.gracefulShutdown());
+    process.on('SIGTERM', () => this.gracefulShutdown());
+
+    try {
+      await this.monitor.start();
+    } catch (error) {
+      this.logger.error({ error }, 'Rebalancer startup error');
+      throw error;
+    }
+  }
+
+  /**
+   * Stop the rebalancer daemon
+   */
+  async stop(): Promise<void> {
+    if (this.monitor) {
+      await this.monitor.stop();
+    }
+  }
+
+  /**
+   * Gracefully shutdown the service
+   */
+  async gracefulShutdown(): Promise<void> {
+    if (this.isExiting) {
+      return;
+    }
+    this.isExiting = true;
+
+    this.logger.info('Gracefully shutting down rebalancer...');
+    await this.stop();
+
+    // Unregister listeners to prevent them from being called again during shutdown
+    process.removeAllListeners('SIGINT');
+    process.removeAllListeners('SIGTERM');
+
+    this.logger.info('Rebalancer shutdown complete');
+    process.exit(0);
+  }
+
+  /**
+   * Event handler for token info updates from monitor
+   */
+  private async onTokenInfo(event: MonitorEvent): Promise<void> {
+    if (this.metrics) {
+      await Promise.all(
+        event.tokensInfo.map((tokenInfo) =>
+          this.metrics!.processToken(tokenInfo),
+        ),
+      );
+    }
+
+    const rawBalances = getRawBalances(
+      Object.keys(this.rebalancerConfig.strategyConfig.chains),
+      event,
+      this.logger,
+    );
+
+    const rebalancingRoutes = this.strategy!.getRebalancingRoutes(rawBalances);
+
+    this.rebalancer
+      ?.rebalance(rebalancingRoutes)
+      .then(() => {
+        this.metrics?.recordRebalancerSuccess();
+        this.logger.info('Rebalancer completed a cycle successfully');
+      })
+      .catch((error: any) => {
+        this.metrics?.recordRebalancerFailure();
+        this.logger.error({ error }, 'Error while rebalancing');
+      });
+  }
+
+  /**
+   * Event handler for monitor errors
+   */
+  private onMonitorError(error: Error): void {
+    if (error instanceof MonitorPollingError) {
+      this.logger.error(error.message);
+      this.metrics?.recordPollingError();
+    } else if (error instanceof MonitorStartError) {
+      this.logger.error(error.message);
+      throw error;
+    } else {
+      this.logger.error(
+        { error },
+        'An unexpected error occurred in the monitor',
+      );
+    }
+  }
+
+  /**
+   * Event handler for monitor start
+   */
+  private onMonitorStart(): void {
+    this.logger.info('Rebalancer started successfully 🚀');
+  }
+}
diff --git a/typescript/cli/src/rebalancer/core/WithInflightGuard.ts b/typescript/rebalancer/src/core/WithInflightGuard.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/core/WithInflightGuard.ts
rename to typescript/rebalancer/src/core/WithInflightGuard.ts
diff --git a/typescript/cli/src/rebalancer/core/WithSemaphore.ts b/typescript/rebalancer/src/core/WithSemaphore.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/core/WithSemaphore.ts
rename to typescript/rebalancer/src/core/WithSemaphore.ts
diff --git a/typescript/cli/src/rebalancer/factories/RebalancerContextFactory.ts b/typescript/rebalancer/src/factories/RebalancerContextFactory.ts
similarity index 80%
rename from typescript/cli/src/rebalancer/factories/RebalancerContextFactory.ts
rename to typescript/rebalancer/src/factories/RebalancerContextFactory.ts
index 6d5028e47b4..f5356464ad8 100644
--- a/typescript/cli/src/rebalancer/factories/RebalancerContextFactory.ts
+++ b/typescript/rebalancer/src/factories/RebalancerContextFactory.ts
@@ -1,9 +1,15 @@
 import { Logger } from 'pino';
 
-import { type ChainMap, type Token, WarpCore } from '@hyperlane-xyz/sdk';
+import { IRegistry } from '@hyperlane-xyz/registry';
+import {
+  type ChainMap,
+  MultiProtocolProvider,
+  MultiProvider,
+  type Token,
+  WarpCore,
+} from '@hyperlane-xyz/sdk';
 import { objMap } from '@hyperlane-xyz/utils';
 
-import type { WriteCommandContext } from '../../context/types.js';
 import { RebalancerConfig } from '../config/RebalancerConfig.js';
 import { Rebalancer } from '../core/Rebalancer.js';
 import { WithSemaphore } from '../core/WithSemaphore.js';
@@ -18,26 +24,33 @@ import { isCollateralizedTokenEligibleForRebalancing } from '../utils/index.js';
 export class RebalancerContextFactory {
   /**
    * @param config - The rebalancer config
-   * @param metadata - A `ChainMap` of chain names and `ChainMetadata` objects, sourced from the `IRegistry`.
    * @param warpCore - An instance of `WarpCore` configured for the specified `warpRouteId`.
    * @param tokensByChainName - A map of chain->token to ease the lookup of token by chain
-   * @param context - CLI context
+   * @param multiProvider - MultiProvider instance
+   * @param registry - IRegistry instance
+   * @param logger - Logger instance
    */
   private constructor(
     private readonly config: RebalancerConfig,
     private readonly warpCore: WarpCore,
     private readonly tokensByChainName: ChainMap<Token>,
-    private readonly context: WriteCommandContext,
+    private readonly multiProvider: MultiProvider,
+    private readonly registry: IRegistry,
     private readonly logger: Logger,
   ) {}
 
   /**
    * @param config - The rebalancer config
-   * @param context - CLI context
+   * @param multiProvider - MultiProvider instance
+   * @param multiProtocolProvider - MultiProtocolProvider instance (optional, created from multiProvider if not provided)
+   * @param registry - IRegistry instance
+   * @param logger - Logger instance
    */
   public static async create(
     config: RebalancerConfig,
-    context: WriteCommandContext,
+    multiProvider: MultiProvider,
+    multiProtocolProvider: MultiProtocolProvider | undefined,
+    registry: IRegistry,
     logger: Logger,
   ): Promise<RebalancerContextFactory> {
     logger.debug(
@@ -46,14 +59,17 @@ export class RebalancerContextFactory {
       },
       'Creating RebalancerContextFactory',
     );
-    const { registry } = context;
     const addresses = await registry.getAddresses();
 
     // The Sealevel warp adapters require the Mailbox address, so we
     // get mailboxes for all chains and merge them with the chain metadata.
     const mailboxes = objMap(addresses, (_, { mailbox }) => ({ mailbox }));
-    const provider =
-      context.multiProtocolProvider.extendChainMetadata(mailboxes);
+
+    // Create MultiProtocolProvider (convert from MultiProvider if not provided)
+    const mpp =
+      multiProtocolProvider ??
+      MultiProtocolProvider.fromMultiProvider(multiProvider);
+    const provider = mpp.extendChainMetadata(mailboxes);
 
     const warpCoreConfig = await registry.getWarpRoute(config.warpRouteId);
     if (!warpCoreConfig) {
@@ -76,7 +92,8 @@ export class RebalancerContextFactory {
       config,
       warpCore,
       tokensByChainName,
-      context,
+      multiProvider,
+      registry,
       logger,
     );
   }
@@ -95,11 +112,11 @@ export class RebalancerContextFactory {
       'Creating Metrics',
     );
     const tokenPriceGetter = PriceGetter.create(
-      this.context.chainMetadata,
+      this.multiProvider.metadata,
       this.logger,
       coingeckoApiKey,
     );
-    const warpDeployConfig = await this.context.registry.getWarpDeployConfig(
+    const warpDeployConfig = await this.registry.getWarpDeployConfig(
       this.config.warpRouteId,
     );
 
@@ -153,18 +170,14 @@ export class RebalancerContextFactory {
         override: v.override,
       })),
       this.warpCore,
-      this.context.chainMetadata,
+      this.multiProvider.metadata,
       this.tokensByChainName,
-      this.context.multiProvider,
+      this.multiProvider,
       this.logger,
       metrics,
     );
 
-    const rebalancerAddress = this.context.signerAddress;
-    if (!rebalancerAddress) {
-      throw new Error('rebalancer address is required');
-    }
-
+    // Wrap with semaphore for concurrency control
     const withSemaphore = new WithSemaphore(
       this.config,
       rebalancer,
diff --git a/typescript/rebalancer/src/index.ts b/typescript/rebalancer/src/index.ts
new file mode 100644
index 00000000000..8287cf52160
--- /dev/null
+++ b/typescript/rebalancer/src/index.ts
@@ -0,0 +1,68 @@
+/**
+ * @hyperlane-xyz/rebalancer
+ *
+ * Hyperlane Warp Route Collateral Rebalancer
+ *
+ * This package provides functionality for automatically rebalancing collateral
+ * across Hyperlane warp routes to maintain optimal token distribution.
+ */
+
+// Core service
+export { RebalancerService } from './core/RebalancerService.js';
+export type {
+  RebalancerServiceConfig,
+  ManualRebalanceRequest,
+} from './core/RebalancerService.js';
+
+// Core rebalancing logic
+export { Rebalancer } from './core/Rebalancer.js';
+export { WithInflightGuard } from './core/WithInflightGuard.js';
+export { WithSemaphore } from './core/WithSemaphore.js';
+
+// Configuration
+export { RebalancerConfig } from './config/RebalancerConfig.js';
+
+// Strategy
+export { BaseStrategy } from './strategy/BaseStrategy.js';
+export { WeightedStrategy } from './strategy/WeightedStrategy.js';
+export { MinAmountStrategy } from './strategy/MinAmountStrategy.js';
+export { StrategyFactory } from './strategy/StrategyFactory.js';
+
+// Monitor
+export { Monitor } from './monitor/Monitor.js';
+
+// Metrics
+export { Metrics } from './metrics/Metrics.js';
+export { PriceGetter } from './metrics/PriceGetter.js';
+
+// Interfaces
+export type {
+  IRebalancer,
+  PreparedTransaction,
+} from './interfaces/IRebalancer.js';
+export type {
+  IStrategy,
+  RebalancingRoute,
+  RawBalances,
+} from './interfaces/IStrategy.js';
+export type { IMonitor } from './interfaces/IMonitor.js';
+export {
+  MonitorEventType,
+  MonitorEvent,
+  MonitorPollingError,
+  MonitorStartError,
+} from './interfaces/IMonitor.js';
+export type { IMetrics } from './interfaces/IMetrics.js';
+
+// Utils
+export { getBridgeConfig } from './utils/bridgeUtils.js';
+export type {
+  BridgeConfigWithOverride,
+  BridgeConfig,
+} from './utils/bridgeUtils.js';
+export { getRawBalances } from './utils/balanceUtils.js';
+export { isCollateralizedTokenEligibleForRebalancing } from './utils/tokenUtils.js';
+export { ExplorerClient } from './utils/ExplorerClient.js';
+
+// Factory
+export { RebalancerContextFactory } from './factories/RebalancerContextFactory.js';
diff --git a/typescript/cli/src/rebalancer/interfaces/IMetrics.ts b/typescript/rebalancer/src/interfaces/IMetrics.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/interfaces/IMetrics.ts
rename to typescript/rebalancer/src/interfaces/IMetrics.ts
diff --git a/typescript/cli/src/rebalancer/interfaces/IMonitor.ts b/typescript/rebalancer/src/interfaces/IMonitor.ts
similarity index 96%
rename from typescript/cli/src/rebalancer/interfaces/IMonitor.ts
rename to typescript/rebalancer/src/interfaces/IMonitor.ts
index 27f54aed410..4c4aa214deb 100644
--- a/typescript/cli/src/rebalancer/interfaces/IMonitor.ts
+++ b/typescript/rebalancer/src/interfaces/IMonitor.ts
@@ -1,6 +1,6 @@
 import { Token } from '@hyperlane-xyz/sdk';
 
-import { WrappedError } from '../../utils/errors.js';
+import { WrappedError } from '../utils/errors.js';
 
 export class MonitorStartError extends WrappedError {
   name = 'MonitorStartError';
diff --git a/typescript/cli/src/rebalancer/interfaces/IRebalancer.ts b/typescript/rebalancer/src/interfaces/IRebalancer.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/interfaces/IRebalancer.ts
rename to typescript/rebalancer/src/interfaces/IRebalancer.ts
diff --git a/typescript/cli/src/rebalancer/interfaces/IStrategy.ts b/typescript/rebalancer/src/interfaces/IStrategy.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/interfaces/IStrategy.ts
rename to typescript/rebalancer/src/interfaces/IStrategy.ts
diff --git a/typescript/cli/src/rebalancer/metrics/Metrics.ts b/typescript/rebalancer/src/metrics/Metrics.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/metrics/Metrics.ts
rename to typescript/rebalancer/src/metrics/Metrics.ts
diff --git a/typescript/cli/src/rebalancer/metrics/PriceGetter.ts b/typescript/rebalancer/src/metrics/PriceGetter.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/metrics/PriceGetter.ts
rename to typescript/rebalancer/src/metrics/PriceGetter.ts
diff --git a/typescript/cli/src/rebalancer/metrics/scripts/metrics.ts b/typescript/rebalancer/src/metrics/scripts/metrics.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/metrics/scripts/metrics.ts
rename to typescript/rebalancer/src/metrics/scripts/metrics.ts
diff --git a/typescript/cli/src/rebalancer/metrics/types.ts b/typescript/rebalancer/src/metrics/types.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/metrics/types.ts
rename to typescript/rebalancer/src/metrics/types.ts
diff --git a/typescript/cli/src/rebalancer/metrics/utils/metrics.ts b/typescript/rebalancer/src/metrics/utils/metrics.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/metrics/utils/metrics.ts
rename to typescript/rebalancer/src/metrics/utils/metrics.ts
diff --git a/typescript/cli/src/rebalancer/monitor/Monitor.ts b/typescript/rebalancer/src/monitor/Monitor.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/monitor/Monitor.ts
rename to typescript/rebalancer/src/monitor/Monitor.ts
diff --git a/typescript/rebalancer/src/service.ts b/typescript/rebalancer/src/service.ts
new file mode 100644
index 00000000000..fbb65134873
--- /dev/null
+++ b/typescript/rebalancer/src/service.ts
@@ -0,0 +1,144 @@
+#!/usr/bin/env node
+/**
+ * Hyperlane Rebalancer Service Entry Point
+ *
+ * This is the main entry point for running the rebalancer as a standalone service
+ * in Kubernetes or other container environments. It reads configuration from
+ * environment variables and files, then starts the rebalancer in daemon mode.
+ *
+ * Environment Variables:
+ * - REBALANCER_CONFIG_FILE: Path to the rebalancer configuration YAML file (required)
+ * - HYP_KEY: Private key for signing transactions (required)
+ * - COINGECKO_API_KEY: API key for CoinGecko price fetching (optional, for metrics)
+ * - CHECK_FREQUENCY: Balance check frequency in ms (default: 60000)
+ * - WITH_METRICS: Enable Prometheus metrics (default: "true")
+ * - MONITOR_ONLY: Run in monitor-only mode without executing transactions (default: "false")
+ * - LOG_LEVEL: Logging level (default: "info") - supported by pino
+ *
+ * Usage:
+ *   node dist/service.js
+ *   REBALANCER_CONFIG_FILE=/config/rebalancer.yaml HYP_KEY=0x... node dist/service.js
+ */
+import { Wallet } from 'ethers';
+
+import { getRegistry } from '@hyperlane-xyz/registry/fs';
+import { MultiProtocolProvider, MultiProvider } from '@hyperlane-xyz/sdk';
+import { createServiceLogger, rootLogger } from '@hyperlane-xyz/utils';
+
+import { RebalancerConfig } from './config/RebalancerConfig.js';
+import { RebalancerService } from './core/RebalancerService.js';
+
+// Read version from package.json
+let VERSION = 'unknown';
+try {
+  const { readFileSync } = await import('fs');
+  const { join } = await import('path');
+  const { fileURLToPath } = await import('url');
+  const __dirname = fileURLToPath(new URL('.', import.meta.url));
+  const packageJson = JSON.parse(
+    readFileSync(join(__dirname, '../package.json'), 'utf-8'),
+  );
+  VERSION = packageJson.version;
+} catch (error) {
+  rootLogger.warn({ error }, 'Could not read version from package.json');
+}
+
+async function main(): Promise<void> {
+  // Validate required environment variables
+  const configFile = process.env.REBALANCER_CONFIG_FILE;
+  if (!configFile) {
+    rootLogger.error('REBALANCER_CONFIG_FILE environment variable is required');
+    process.exit(1);
+  }
+
+  const privateKey = process.env.HYP_KEY;
+  if (!privateKey) {
+    rootLogger.error('HYP_KEY environment variable is required');
+    process.exit(1);
+  }
+
+  // Parse optional environment variables
+  const checkFrequency = process.env.CHECK_FREQUENCY
+    ? parseInt(process.env.CHECK_FREQUENCY, 10)
+    : 60_000;
+
+  const withMetrics = process.env.WITH_METRICS !== 'false';
+  const monitorOnly = process.env.MONITOR_ONLY === 'true';
+  const coingeckoApiKey = process.env.COINGECKO_API_KEY;
+
+  // Create logger (uses LOG_LEVEL environment variable for level configuration)
+  const logger = await createServiceLogger({
+    service: 'rebalancer',
+    version: VERSION,
+  });
+
+  logger.info(
+    {
+      version: VERSION,
+      configFile,
+      checkFrequency,
+      withMetrics,
+      monitorOnly,
+    },
+    'Starting Hyperlane Rebalancer Service',
+  );
+
+  try {
+    // Load rebalancer configuration
+    const rebalancerConfig = RebalancerConfig.load(configFile);
+    logger.info('✅ Loaded rebalancer configuration');
+
+    // Initialize registry (uses default registry URIs)
+    const registry = getRegistry({
+      registryUris: [],
+      enableProxy: false,
+      logger: rootLogger,
+    });
+    logger.info('✅ Initialized registry');
+
+    // Get chain metadata from registry
+    const chainMetadata = await registry.getMetadata();
+    logger.info(
+      `✅ Loaded metadata for ${Object.keys(chainMetadata).length} chains`,
+    );
+
+    // Create MultiProvider with signer
+    const multiProvider = new MultiProvider(chainMetadata);
+    const signer = new Wallet(privateKey);
+    multiProvider.setSharedSigner(signer);
+    logger.info('✅ Initialized MultiProvider with signer');
+
+    // Create MultiProtocolProvider
+    const multiProtocolProvider = new MultiProtocolProvider(chainMetadata);
+    logger.info('✅ Initialized MultiProtocolProvider');
+
+    // Create the rebalancer service
+    const service = new RebalancerService(
+      multiProvider,
+      multiProtocolProvider,
+      registry,
+      rebalancerConfig,
+      {
+        mode: 'daemon',
+        checkFrequency,
+        monitorOnly,
+        withMetrics,
+        coingeckoApiKey,
+        logger,
+        version: VERSION,
+      },
+    );
+
+    // Start the service
+    await service.start();
+  } catch (error) {
+    logger.error({ error }, 'Failed to start rebalancer service');
+    process.exit(1);
+  }
+}
+
+// Run the service
+main().catch((error) => {
+  rootLogger.error({ error }, 'Fatal error');
+  process.exit(1);
+});
diff --git a/typescript/cli/src/rebalancer/strategy/BaseStrategy.ts b/typescript/rebalancer/src/strategy/BaseStrategy.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/strategy/BaseStrategy.ts
rename to typescript/rebalancer/src/strategy/BaseStrategy.ts
diff --git a/typescript/cli/src/rebalancer/strategy/MinAmountStrategy.test.ts b/typescript/rebalancer/src/strategy/MinAmountStrategy.test.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/strategy/MinAmountStrategy.test.ts
rename to typescript/rebalancer/src/strategy/MinAmountStrategy.test.ts
diff --git a/typescript/cli/src/rebalancer/strategy/MinAmountStrategy.ts b/typescript/rebalancer/src/strategy/MinAmountStrategy.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/strategy/MinAmountStrategy.ts
rename to typescript/rebalancer/src/strategy/MinAmountStrategy.ts
diff --git a/typescript/cli/src/rebalancer/strategy/StrategyFactory.test.ts b/typescript/rebalancer/src/strategy/StrategyFactory.test.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/strategy/StrategyFactory.test.ts
rename to typescript/rebalancer/src/strategy/StrategyFactory.test.ts
diff --git a/typescript/cli/src/rebalancer/strategy/StrategyFactory.ts b/typescript/rebalancer/src/strategy/StrategyFactory.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/strategy/StrategyFactory.ts
rename to typescript/rebalancer/src/strategy/StrategyFactory.ts
diff --git a/typescript/cli/src/rebalancer/strategy/WeightedStrategy.test.ts b/typescript/rebalancer/src/strategy/WeightedStrategy.test.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/strategy/WeightedStrategy.test.ts
rename to typescript/rebalancer/src/strategy/WeightedStrategy.test.ts
diff --git a/typescript/cli/src/rebalancer/strategy/WeightedStrategy.ts b/typescript/rebalancer/src/strategy/WeightedStrategy.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/strategy/WeightedStrategy.ts
rename to typescript/rebalancer/src/strategy/WeightedStrategy.ts
diff --git a/typescript/cli/src/rebalancer/strategy/index.ts b/typescript/rebalancer/src/strategy/index.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/strategy/index.ts
rename to typescript/rebalancer/src/strategy/index.ts
diff --git a/typescript/cli/src/rebalancer/test/helpers.ts b/typescript/rebalancer/src/test/helpers.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/test/helpers.ts
rename to typescript/rebalancer/src/test/helpers.ts
diff --git a/typescript/cli/src/rebalancer/utils/ExplorerClient.ts b/typescript/rebalancer/src/utils/ExplorerClient.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/utils/ExplorerClient.ts
rename to typescript/rebalancer/src/utils/ExplorerClient.ts
diff --git a/typescript/cli/src/rebalancer/utils/balanceUtils.test.ts b/typescript/rebalancer/src/utils/balanceUtils.test.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/utils/balanceUtils.test.ts
rename to typescript/rebalancer/src/utils/balanceUtils.test.ts
diff --git a/typescript/cli/src/rebalancer/utils/balanceUtils.ts b/typescript/rebalancer/src/utils/balanceUtils.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/utils/balanceUtils.ts
rename to typescript/rebalancer/src/utils/balanceUtils.ts
diff --git a/typescript/cli/src/rebalancer/utils/bridgeUtils.test.ts b/typescript/rebalancer/src/utils/bridgeUtils.test.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/utils/bridgeUtils.test.ts
rename to typescript/rebalancer/src/utils/bridgeUtils.test.ts
diff --git a/typescript/cli/src/rebalancer/utils/bridgeUtils.ts b/typescript/rebalancer/src/utils/bridgeUtils.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/utils/bridgeUtils.ts
rename to typescript/rebalancer/src/utils/bridgeUtils.ts
diff --git a/typescript/rebalancer/src/utils/errors.ts b/typescript/rebalancer/src/utils/errors.ts
new file mode 100644
index 00000000000..7f04aeab1e1
--- /dev/null
+++ b/typescript/rebalancer/src/utils/errors.ts
@@ -0,0 +1,5 @@
+export class WrappedError extends Error {
+  constructor(message: string, cause?: Error) {
+    super(message, cause ? { cause } : undefined);
+  }
+}
diff --git a/typescript/rebalancer/src/utils/files.ts b/typescript/rebalancer/src/utils/files.ts
new file mode 100644
index 00000000000..762f670facc
--- /dev/null
+++ b/typescript/rebalancer/src/utils/files.ts
@@ -0,0 +1,266 @@
+import { input } from '@inquirer/prompts';
+import select from '@inquirer/select';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import {
+  DocumentOptions,
+  LineCounter,
+  ParseOptions,
+  SchemaOptions,
+  ToJSOptions,
+  parse,
+  stringify as yamlStringify,
+} from 'yaml';
+
+import { objMerge, rootLogger } from '@hyperlane-xyz/utils';
+
+const yamlParse = (
+  content: string,
+  options?: ParseOptions & DocumentOptions & SchemaOptions & ToJSOptions,
+) =>
+  // See stackoverflow.com/questions/63075256/why-does-the-npm-yaml-library-have-a-max-alias-number
+  parse(content, { maxAliasCount: -1, ...options });
+
+export const MAX_READ_LINE_OUTPUT = 250;
+
+export type FileFormat = 'yaml' | 'json';
+
+export type ArtifactsFile = {
+  filename: string;
+  description: string;
+};
+
+export function removeEndingSlash(dirPath: string): string {
+  if (dirPath.endsWith('/')) {
+    return dirPath.slice(0, -1);
+  }
+  return dirPath;
+}
+
+export function resolvePath(filePath: string): string {
+  if (filePath.startsWith('~')) {
+    const homedir = os.homedir();
+    return path.join(homedir, filePath.slice(1));
+  }
+  return filePath;
+}
+
+export function isFile(filepath: string) {
+  if (!filepath) return false;
+  try {
+    return fs.existsSync(filepath) && fs.lstatSync(filepath).isFile();
+  } catch {
+    rootLogger.warn(`Error checking for file: ${filepath}`);
+    return false;
+  }
+}
+
+export function readFileAtPath(filepath: string) {
+  if (!isFile(filepath)) {
+    throw Error(`File doesn't exist at ${filepath}`);
+  }
+  return fs.readFileSync(filepath, 'utf8');
+}
+
+export function writeFileAtPath(filepath: string, value: string) {
+  const dirname = path.dirname(filepath);
+  if (!isFile(dirname)) {
+    fs.mkdirSync(dirname, { recursive: true });
+  }
+  fs.writeFileSync(filepath, value);
+}
+
+export function readJson<T>(filepath: string): T {
+  return JSON.parse(readFileAtPath(filepath)) as T;
+}
+
+export function tryReadJson<T>(filepath: string): T | null {
+  try {
+    return readJson(filepath) as T;
+  } catch {
+    return null;
+  }
+}
+
+export function writeJson(filepath: string, obj: any) {
+  writeFileAtPath(filepath, JSON.stringify(obj, null, 2) + '\n');
+}
+
+export function mergeJson<T extends Record<string, any>>(
+  filepath: string,
+  obj: T,
+) {
+  if (isFile(filepath)) {
+    const previous = readJson<T>(filepath);
+    writeJson(filepath, objMerge(previous, obj));
+  } else {
+    writeJson(filepath, obj);
+  }
+}
+
+export function readYaml<T>(filepath: string): T {
+  return yamlParse(readFileAtPath(filepath)) as T;
+}
+
+export function tryReadYamlAtPath<T>(filepath: string): T | null {
+  try {
+    return readYaml(filepath);
+  } catch {
+    return null;
+  }
+}
+
+export function writeYaml(filepath: string, obj: any) {
+  writeFileAtPath(
+    filepath,
+    yamlStringify(obj, { indent: 2, sortMapEntries: true }) + '\n',
+  );
+}
+
+export function mergeYaml<T extends Record<string, any>>(
+  filepath: string,
+  obj: T,
+) {
+  if (isFile(filepath)) {
+    const previous = readYaml<T>(filepath);
+    writeYaml(filepath, objMerge(previous, obj));
+  } else {
+    writeYaml(filepath, obj);
+  }
+}
+
+export function readYamlOrJson<T>(filepath: string, format?: FileFormat): T {
+  return resolveYamlOrJsonFn(filepath, readJson, readYaml, format);
+}
+
+export function writeYamlOrJson(
+  filepath: string,
+  obj: Record<string, any>,
+  format?: FileFormat,
+) {
+  return resolveYamlOrJsonFn(
+    filepath,
+    (f: string) => writeJson(f, obj),
+    (f: string) => writeYaml(f, obj),
+    format,
+  );
+}
+
+export function mergeYamlOrJson(
+  filepath: string,
+  obj: Record<string, any>,
+  format: FileFormat = 'yaml',
+) {
+  return resolveYamlOrJsonFn(
+    filepath,
+    (f: string) => mergeJson(f, obj),
+    (f: string) => mergeYaml(f, obj),
+    format,
+  );
+}
+
+function resolveYamlOrJsonFn(
+  filepath: string,
+  jsonFn: any,
+  yamlFn: any,
+  format?: FileFormat,
+) {
+  const fileFormat = resolveFileFormat(filepath, format);
+  if (!fileFormat) {
+    throw new Error(`Invalid file format for ${filepath}`);
+  }
+
+  if (fileFormat === 'json') {
+    return jsonFn(filepath);
+  }
+
+  return yamlFn(filepath);
+}
+
+export function resolveFileFormat(
+  filepath?: string,
+  format?: FileFormat,
+): FileFormat | undefined {
+  // early out if filepath is undefined
+  if (!filepath) {
+    return format;
+  }
+
+  if (format === 'json' || filepath?.endsWith('.json')) {
+    return 'json';
+  }
+
+  if (
+    format === 'yaml' ||
+    filepath?.endsWith('.yaml') ||
+    filepath?.endsWith('.yml')
+  ) {
+    return 'yaml';
+  }
+
+  return undefined;
+}
+
+export async function runFileSelectionStep(
+  folderPath: string,
+  description: string,
+  pattern?: string,
+) {
+  const noFilesErrorMessage = `No "${description}" found in ${folderPath}. Please confirm the path for "${description}". By default, the CLI writes to folders relative to where its run.`;
+  if (!fs.existsSync(folderPath)) throw new Error(noFilesErrorMessage);
+
+  let filenames = fs.readdirSync(folderPath);
+  if (pattern) {
+    filenames = filenames.filter((f) => f.includes(pattern));
+  }
+
+  if (filenames.length === 0) throw new Error(noFilesErrorMessage);
+
+  let filename = (await select({
+    message: `Select ${description} file`,
+    choices: [
+      ...filenames.map((f) => ({ name: f, value: f })),
+      { name: '(Other file)', value: null },
+    ],
+    pageSize: 20,
+  })) as string;
+
+  if (filename) return path.join(folderPath, filename);
+
+  filename = await input({
+    message: `Enter ${description} filepath`,
+  });
+
+  if (filename) return filename;
+  else throw new Error(`No filepath entered ${description}`);
+}
+
+export function indentYamlOrJson(str: string, indentLevel: number): string {
+  const indent = ' '.repeat(indentLevel);
+  return str
+    .split('\n')
+    .map((line) => indent + line)
+    .join('\n');
+}
+
+/**
+ * Logs the YAML representation of an object if the number of lines is less than the specified maximum.
+ *
+ * @param obj - The object to be converted to YAML.
+ * @param maxLines - The maximum number of lines allowed for the YAML representation.
+ * @param margin - The number of spaces to use for indentation (default is 2).
+ */
+export function logYamlIfUnderMaxLines(
+  obj: any,
+  maxLines: number = MAX_READ_LINE_OUTPUT,
+  margin: number = 2,
+): void {
+  const asYamlString = yamlStringify(obj, null, margin);
+  const lineCounter = new LineCounter();
+  yamlParse(asYamlString, { lineCounter });
+
+  if (lineCounter.lineStarts.length < maxLines) {
+    rootLogger.info(asYamlString);
+  }
+}
diff --git a/typescript/cli/src/rebalancer/utils/generalUtils.ts b/typescript/rebalancer/src/utils/generalUtils.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/utils/generalUtils.ts
rename to typescript/rebalancer/src/utils/generalUtils.ts
diff --git a/typescript/cli/src/rebalancer/utils/index.ts b/typescript/rebalancer/src/utils/index.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/utils/index.ts
rename to typescript/rebalancer/src/utils/index.ts
diff --git a/typescript/cli/src/rebalancer/utils/tokenUtils.ts b/typescript/rebalancer/src/utils/tokenUtils.ts
similarity index 100%
rename from typescript/cli/src/rebalancer/utils/tokenUtils.ts
rename to typescript/rebalancer/src/utils/tokenUtils.ts
diff --git a/typescript/rebalancer/tsconfig.json b/typescript/rebalancer/tsconfig.json
new file mode 100644
index 00000000000..9005365a9b7
--- /dev/null
+++ b/typescript/rebalancer/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "@hyperlane-xyz/tsconfig/tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist",
+    "rootDir": "./src"
+  },
+  "include": ["./src/**/*"]
+}
diff --git a/typescript/widgets/package.json b/typescript/widgets/package.json
index a043cc6aeda..69d7c28874c 100644
--- a/typescript/widgets/package.json
+++ b/typescript/widgets/package.json
@@ -37,7 +37,7 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
     "@eslint/js": "^9.31.0",
-    "@hyperlane-xyz/registry": "20.0.0",
+    "@hyperlane-xyz/registry": "23.6.0",
     "@hyperlane-xyz/tsconfig": "workspace:^",
     "@storybook/addon-essentials": "^7.6.14",
     "@storybook/addon-interactions": "^7.6.14",
diff --git a/yarn.lock b/yarn.lock
index c5fb282f586..711c88e1993 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8138,7 +8138,7 @@ __metadata:
     "@eth-optimism/sdk": "npm:^3.3.3"
     "@google-cloud/pino-logging-gcp-config": "npm:^1.0.6"
     "@hyperlane-xyz/core": "npm:10.0.4"
-    "@hyperlane-xyz/registry": "npm:20.0.0"
+    "@hyperlane-xyz/registry": "npm:23.6.0"
     "@hyperlane-xyz/sdk": "npm:19.10.0"
     "@hyperlane-xyz/tsconfig": "workspace:^"
     "@hyperlane-xyz/utils": "npm:19.10.0"
@@ -8162,7 +8162,7 @@ __metadata:
     pino-pretty: "npm:^13.0.0"
     prettier: "npm:^3.5.3"
     prisma: "npm:^6.8.2"
-    prom-client: "npm:^14.0.1"
+    prom-client: "npm:^15.1.0"
     ts-jest: "npm:^29.1.2"
     ts-node: "npm:^10.8.0"
     tsx: "npm:^4.19.1"
@@ -8187,7 +8187,8 @@ __metadata:
     "@hyperlane-xyz/http-registry-server": "npm:19.10.0"
     "@hyperlane-xyz/provider-sdk": "npm:0.2.0"
     "@hyperlane-xyz/radix-sdk": "npm:19.10.0"
-    "@hyperlane-xyz/registry": "npm:20.0.0"
+    "@hyperlane-xyz/rebalancer": "npm:0.1.0"
+    "@hyperlane-xyz/registry": "npm:23.6.0"
     "@hyperlane-xyz/sdk": "npm:19.10.0"
     "@hyperlane-xyz/tsconfig": "workspace:^"
     "@hyperlane-xyz/utils": "npm:19.10.0"
@@ -8221,7 +8222,7 @@ __metadata:
     mocha: "npm:^11.5.0"
     pino: "npm:^8.19.0"
     prettier: "npm:^3.5.3"
-    prom-client: "npm:^14.0.1"
+    prom-client: "npm:^15.1.0"
     sinon: "npm:^13.0.2"
     terminal-link: "npm:^3.0.0"
     testcontainers: "npm:11.7.0"
@@ -8398,7 +8399,7 @@ __metadata:
     "@ethersproject/abi": "npm:*"
     "@ethersproject/providers": "npm:*"
     "@hyperlane-xyz/core": "npm:10.0.4"
-    "@hyperlane-xyz/registry": "npm:20.0.0"
+    "@hyperlane-xyz/registry": "npm:23.6.0"
     "@hyperlane-xyz/sdk": "npm:19.10.0"
     "@hyperlane-xyz/utils": "npm:19.10.0"
     "@nomiclabs/hardhat-ethers": "npm:^2.2.3"
@@ -8444,7 +8445,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/http-registry-server@workspace:typescript/http-registry-server"
   dependencies:
-    "@hyperlane-xyz/registry": "npm:20.0.0"
+    "@hyperlane-xyz/registry": "npm:23.6.0"
     "@hyperlane-xyz/sdk": "npm:19.10.0"
     "@hyperlane-xyz/tsconfig": "workspace:^"
     "@hyperlane-xyz/utils": "npm:19.10.0"
@@ -8493,7 +8494,7 @@ __metadata:
     "@hyperlane-xyz/core": "npm:10.0.4"
     "@hyperlane-xyz/helloworld": "npm:19.10.0"
     "@hyperlane-xyz/http-registry-server": "npm:19.10.0"
-    "@hyperlane-xyz/registry": "npm:20.0.0"
+    "@hyperlane-xyz/registry": "npm:23.6.0"
     "@hyperlane-xyz/sdk": "npm:19.10.0"
     "@hyperlane-xyz/tsconfig": "workspace:^"
     "@hyperlane-xyz/utils": "npm:19.10.0"
@@ -8534,7 +8535,7 @@ __metadata:
     mocha: "npm:^11.5.0"
     postgres: "npm:^3.4.5"
     prettier: "npm:^3.5.3"
-    prom-client: "npm:^14.0.1"
+    prom-client: "npm:^15.1.0"
     prompts: "npm:^2.4.2"
     smol-toml: "npm:1.4.2"
     tmp: "npm:^0.2.3"
@@ -8619,14 +8620,49 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@hyperlane-xyz/registry@npm:20.0.0":
-  version: 20.0.0
-  resolution: "@hyperlane-xyz/registry@npm:20.0.0"
+"@hyperlane-xyz/rebalancer@npm:0.1.0, @hyperlane-xyz/rebalancer@workspace:typescript/rebalancer":
+  version: 0.0.0-use.local
+  resolution: "@hyperlane-xyz/rebalancer@workspace:typescript/rebalancer"
+  dependencies:
+    "@google-cloud/pino-logging-gcp-config": "npm:^1.0.6"
+    "@hyperlane-xyz/core": "npm:10.0.4"
+    "@hyperlane-xyz/provider-sdk": "npm:0.2.0"
+    "@hyperlane-xyz/registry": "npm:23.6.0"
+    "@hyperlane-xyz/sdk": "npm:19.10.0"
+    "@hyperlane-xyz/utils": "npm:19.10.0"
+    "@inquirer/prompts": "npm:3.3.2"
+    "@inquirer/select": "npm:^1.3.3"
+    "@types/express": "npm:^5.0.3"
+    "@types/mocha": "npm:^10.0.1"
+    "@types/node": "npm:^18.14.5"
+    bignumber.js: "npm:^9.1.1"
+    chai: "npm:^4.5.0"
+    eslint: "npm:^9.31.0"
+    ethers: "npm:^5.8.0"
+    express: "npm:^5.1.0"
+    mocha: "npm:^11.5.0"
+    pino: "npm:^8.19.0"
+    pino-pretty: "npm:^13.0.0"
+    prettier: "npm:^3.5.3"
+    prom-client: "npm:^15.1.0"
+    tsx: "npm:^4.19.1"
+    typescript: "npm:5.3.3"
+    yaml: "npm:2.4.5"
+    zod: "npm:^3.21.2"
+    zod-validation-error: "npm:^3.3.0"
+  bin:
+    hyperlane-rebalancer: ./dist/service.js
+  languageName: unknown
+  linkType: soft
+
+"@hyperlane-xyz/registry@npm:23.6.0":
+  version: 23.6.0
+  resolution: "@hyperlane-xyz/registry@npm:23.6.0"
   dependencies:
     jszip: "npm:^3.10.1"
     yaml: "npm:2.4.5"
     zod: "npm:^3.21.2"
-  checksum: 10/0eaa9accf96822d5d8c4df8476d1688a725ff967e3bcbac41c68c82392add1835d8f629a4e70f37b271b51666751e83f79f4557b8bd71b39b6c207a0148395f4
+  checksum: 10/5aa3934d5c27a36a11bca82abd5ee3ce63da729c8c238b9c9eca7309fb4d19674c191a0116b891f38ab4512481658eb605ae718025cc07ef680885d22b1cef35
   languageName: node
   linkType: hard
 
@@ -8782,7 +8818,7 @@ __metadata:
     "@hyperlane-xyz/cosmos-sdk": "npm:19.10.0"
     "@hyperlane-xyz/provider-sdk": "npm:0.2.0"
     "@hyperlane-xyz/radix-sdk": "npm:19.10.0"
-    "@hyperlane-xyz/registry": "npm:20.0.0"
+    "@hyperlane-xyz/registry": "npm:23.6.0"
     "@hyperlane-xyz/sdk": "npm:19.10.0"
     "@hyperlane-xyz/tsconfig": "workspace:^"
     "@hyperlane-xyz/utils": "npm:19.10.0"
@@ -10917,7 +10953,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/api@npm:^1.7.0":
+"@opentelemetry/api@npm:^1.4.0, @opentelemetry/api@npm:^1.7.0":
   version: 1.9.0
   resolution: "@opentelemetry/api@npm:1.9.0"
   checksum: 10/a607f0eef971893c4f2ee2a4c2069aade6ec3e84e2a1f5c2aac19f65c5d9eeea41aa72db917c1029faafdd71789a1a040bdc18f40d63690e22ccae5d7070f194
@@ -34902,12 +34938,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prom-client@npm:^14.0.1":
-  version: 14.0.1
-  resolution: "prom-client@npm:14.0.1"
+"prom-client@npm:^15.1.0":
+  version: 15.1.3
+  resolution: "prom-client@npm:15.1.3"
   dependencies:
+    "@opentelemetry/api": "npm:^1.4.0"
     tdigest: "npm:^0.1.1"
-  checksum: 10/19b36201d6b07f8d02e4ee81c2484a169ae69007a18d87e079b5c3b991b4b39b3193dd0c86c9e9a96e555af459692377225a86f4af99cf426354106309127a0c
+  checksum: 10/eba75e15ab896845d39359e3a4d6f7913ea05339b3122d8dde8c8c374669ad1a1d1ab2694ab2101c420bd98086a564e4f2a18aa29018fc14a4732e57c1c19aec
   languageName: node
   linkType: hard
 
@@ -42621,27 +42658,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod@npm:^3.21.2":
+"zod@npm:3.21.2":
   version: 3.21.2
   resolution: "zod@npm:3.21.2"
   checksum: 10/1c67216871808c3beaeaf2439adfc589055502665e8fc4267abf36dc4f673018cd15575e8f38a3eb9b8edb43356d91a809fc6ded3fab4b7f5d6a3982d0b97c77
   languageName: node
   linkType: hard
 
-"zod@npm:^3.22.3":
-  version: 3.23.8
-  resolution: "zod@npm:3.23.8"
-  checksum: 10/846fd73e1af0def79c19d510ea9e4a795544a67d5b34b7e1c4d0425bf6bfd1c719446d94cdfa1721c1987d891321d61f779e8236fde517dc0e524aa851a6eff1
-  languageName: node
-  linkType: hard
-
-"zod@npm:^3.22.4":
-  version: 3.24.2
-  resolution: "zod@npm:3.24.2"
-  checksum: 10/604c62a8cf8e330d78b106a557f4b44f5d14845d20b1360a423ccc09b58cb8525ccf7e4b40cf1bd4852d22393d2c67774b5817ec5a2fedab25f543b36ed15943
-  languageName: node
-  linkType: hard
-
 "zustand@npm:5.0.0":
   version: 5.0.0
   resolution: "zustand@npm:5.0.0"