@conquest-eth/tools 0.0.0 → 0.0.2

package/README.md

@@ -12,8 +12,7 @@ A dual-mode CLI tool for interacting with the Conquest.eth blockchain game. It c
 ## Installation
 
 ```bash
-pnpm install
-pnpm build
+npm i -g @conquest-eth/tools
 ```
 
 ## Usage
@@ -23,18 +22,17 @@ pnpm build
 Show help and available commands:
 
 ```bash
-node dist/cli.js --help
+ecli --help
 ```
 
 #### Global Options
 
-| Option                      | Environment Variable | Description                      | Default                  |
-| --------------------------- | -------------------- | -------------------------------- | ------------------------ |
-| `--rpc-url <url>`           | `RPC_URL`            | RPC URL for the Ethereum network | (required)               |
-| `--game-contract <address>` | `GAME_CONTRACT`      | Game contract address            | (required)               |
-| `--storage <type>`          | `STORAGE_TYPE`       | Storage backend: json or sqlite  | json                     |
-| `--storage-path <path>`     | `STORAGE_PATH`       | Storage directory path           | ./data                   |
-| `--private-key <key>`       | `PRIVATE_KEY`        | Private key for transactions     | (required for write ops) |
+| Option                      | Environment Variable | Description                      | Default    |
+| --------------------------- | -------------------- | -------------------------------- | ---------- |
+| `--rpc-url <url>`           | `RPC_URL`            | RPC URL for the Ethereum network | (required) |
+| `--game-contract <address>` | `GAME_CONTRACT`      | Game contract address            | (required) |
+| `--storage <type>`          | `STORAGE_TYPE`       | Storage backend: json or sqlite  | json       |
+| `--storage-path <path>`     | `STORAGE_PATH`       | Storage directory path           | ./data     |
 
 #### MCP Server Options
 
@@ -55,7 +53,7 @@ export PRIVATE_KEY=0x...
 Then run commands without repeating options:
 
 ```bash
-node dist/cli.js get_my_planets --radius 10
+ecli get_my_planets --radius 10
 ```
 
 #### Available Commands
@@ -76,22 +74,22 @@ node dist/cli.js get_my_planets --radius 10
 
 ```bash
 # Get your planets
-node dist/cli.js get_my_planets --radius 10
+ecli get_my_planets --radius 10
 
 # Find planets near a location
-node dist/cli.js get_planets_around --center-x 0 --center-y 0 --radius 20
+ecli get_planets_around --center-x 0 --center-y 0 --radius 20
 
 # Acquire planets
-node dist/cli.js acquire_planets --planet-ids 1,2,3,4,5
+ecli acquire_planets --planet-ids 1,2,3,4,5
 
-# Send a fleet
-node dist/cli.js send_fleet --from-x 10 --from-y 20 --to-x 15 --to-y 25 --quantity 100
+# Send a fleet (coordinates use x,y format)
+ecli send_fleet --from 10,20 --to 15,25 --quantity 100
 
 # Resolve a fleet
-node dist/cli.js resolve_fleet --fleet-id "your-fleet-id"
+ecli resolve_fleet --fleet-id "your-fleet-id"
 
 # Exit planets
-node dist/cli.js exit_planets --planet-ids 1,2,3
+ecli exit_planets --planet-ids 1,2,3
 ```
 
 See [`EXAMPLES.md`](./EXAMPLES.md) for more detailed usage examples.
@@ -101,19 +99,19 @@ See [`EXAMPLES.md`](./EXAMPLES.md) for more detailed usage examples.
 Start the MCP server for AI assistant integration:
 
 ```bash
-node dist/cli.js mcp --rpc-url https://rpc.gnosischain.com --game-contract 0x322813fd9a801c5507c9de605d63cea4f2ce6c44
+ecli mcp --rpc-url https://rpc.gnosischain.com --game-contract 0x322813fd9a801c5507c9de605d63cea4f2ce6c44
 ```
 
 Or use the MCP Inspector for testing:
 
 ```bash
-pnpm mcp:inspector node dist/cli.js --game-contract 0xD833d4dBBb0C19aF1EEf76540d66E2076a5e9D72 --rpc-url https://rpc.gnosis.gateway.fm
+pnpm mcp:inspector ecli --game-contract 0xD833d4dBBb0C19aF1EEf76540d66E2076a5e9D72 --rpc-url https://rpc.gnosis.gateway.fm
 ```
 
 For Conquest 2025-1 edition, use:
 
 ```bash
-pnpm mcp:inspector node dist/cli.js --game-contract 0xD833d4dBBb0C19aF1EEf76540d66E2076a5e9D72 --rpc-url https://rpc.gnosis.gateway.fm
+pnpm mcp:inspector ecli --game-contract 0xD833d4dBBb0C19aF1EEf76540d66E2076a5e9D72 --rpc-url https://rpc.gnosis.gateway.fm
 ```
 
 ## Architecture
@@ -143,7 +141,7 @@ Tools are defined with a standardized pattern:
 
 ```typescript
 import {z} from 'zod';
-import {createTool} from '../types.js';
+import {createTool} from '../tool-handling/types.js';
 
 export const example_tool = createTool({
 	description: 'Description of what this tool does',
@@ -215,35 +213,6 @@ pnpm format
 pnpm start
 ```
 
-## Project Structure
-
-```
-lobsters/mcp/src/
-├── cli.ts                    # CLI entry point (dual-mode)
-├── cli-tool-generator.ts     # Dynamic CLI command generation
-├── index.ts                  # MCP server setup
-├── types.ts                  # Type definitions
-├── helpers/
-│   └── index.ts              # Helper functions
-├── tools/
-│   ├── index.ts              # Tool exports
-│   ├── acquire_planets.ts    # Tool implementations
-│   ├── send_fleet.ts
-│   ├── resolve_fleet.ts
-│   └── ...
-├── fleet/
-│   ├── manager.ts            # Fleet operations manager
-│   ├── send.ts
-│   └── resolve.ts
-├── planet/
-│   ├── manager.ts            # Planet operations manager
-│   ├── acquire.ts
-│   └── exit.ts
-└── storage/
-    ├── interface.ts          # Storage interface
-    └── json-storage.ts       # JSON storage implementation
-```
-
 ## License
 
 MIT

package/dist/cli-tool-generator.d.ts

@@ -1,6 +1,7 @@
 import { Command } from 'commander';
 import { z } from 'zod';
-import type { Tool, StorageConfig } from './types.js';
+import type { Tool } from './tool-handling/types.js';
+import type { StorageConfig } from './types.js';
 /**
  * CLI configuration parameters
  */

package/dist/cli-tool-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-tool-generator.d.ts","sourceRoot":"","sources":["../src/cli-tool-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AACtB,OAAO,KAAK,EAAC,IAAI,EAAmB,aAAa,EAAC,MAAM,YAAY,CAAC;AAWrE;;GAEG;AACH,MAAM,WAAW,SAAS;IACzB,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC3B,YAAY,EAAE,KAAK,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,aAAa,CAAC;CAC7B;AA6HD;;GAEG;AACH,wBAAgB,mBAAmB,CAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAC1B,IAAI,CAuHN;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,CAQ3F"}
+{"version":3,"file":"cli-tool-generator.d.ts","sourceRoot":"","sources":["../src/cli-tool-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AACtB,OAAO,KAAK,EAAC,IAAI,EAAkB,MAAM,0BAA0B,CAAC;AAOpE,OAAO,KAAK,EAA0C,aAAa,EAAC,MAAM,YAAY,CAAC;AAIvF;;GAEG;AACH,MAAM,WAAW,SAAS;IACzB,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC3B,YAAY,EAAE,KAAK,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,aAAa,CAAC;CAC7B;AA6HD;;GAEG;AACH,wBAAgB,mBAAmB,CAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAC1B,IAAI,CAuHN;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,CAQ3F"}

package/dist/cli.js

@@ -1,16 +1,19 @@
 #!/usr/bin/env node
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { createServer } from './index.js';
 import { Command } from 'commander';
 import pkg from '../package.json' with { type: 'json' };
-import { getChain } from 'tools-ethereum/helpers';
 import { loadEnv } from 'ldenv';
 import * as tools from './tools/index.js';
-import { registerAllToolCommands } from './cli-tool-generator.js';
+import { registerAllToolCommands } from './tool-handling/cli.js';
+import { createServer } from './mcp.js';
+import { createConquestEnv } from './index.js';
 loadEnv();
 const program = new Command();
 // Get the binary name from package.json
 const binName = Object.keys(pkg.bin || {})[0];
+// ----------------------------------------------------------------------------
+// GLOBAL OPTIONS
+// ----------------------------------------------------------------------------
 program
     .name(binName)
     .description(pkg.description || 'Conquest.eth CLI - MCP server and direct tool execution')
@@ -20,24 +23,15 @@ program
     .option('--game-contract <address>', 'Contract address of the game', process.env.GAME_CONTRACT || '')
     .option('--storage <type>', 'Storage backend: json or sqlite', process.env.STORAGE_TYPE || 'json')
     .option('--storage-path <path>', 'Path to storage directory', process.env.STORAGE_PATH || './data')
-    .option('--private-key <key>', 'Private key for sending transactions', process.env.PRIVATE_KEY || '')
     .action(() => {
     program.help();
 });
-// MCP subcommand - starts the MCP server
-program
-    .command('mcp')
-    .description('Start the MCP server')
-    .option('--ethereum', 'Whether to also provide tools-ethereum tools', process.env.ETHEREUM_TOOLS === 'true')
-    .action(async () => {
-    const options = program.opts();
-    const mcpOptions = program.commands.find((cmd) => cmd.name() === 'mcp')?.opts() || {};
-    const rpcUrl = options.rpcUrl;
-    const gameContract = options.gameContract;
-    const ethereum = mcpOptions.ethereum ?? process.env.ETHEREUM_TOOLS === 'true';
-    const privateKey = options.privateKey;
-    const storage = options.storage;
-    const storagePath = options.storagePath;
+function gatherGlobalOptions(program) {
+    const globalOptions = program.opts();
+    const rpcUrl = globalOptions.rpcUrl;
+    const gameContract = globalOptions.gameContract;
+    const storage = globalOptions.storage;
+    const storagePath = globalOptions.storagePath;
     // Validate required options
     if (!rpcUrl) {
         console.error('Error: --rpc-url option or RPC_URL environment variable is required');
@@ -47,6 +41,7 @@ program
         console.error('Error: --game-contract option or GAME_CONTRACT environment variable is required');
         process.exit(1);
     }
+    const privateKey = process.env.PRIVATE_KEY;
     // Warn if private key is not provided for write operations
     if (!privateKey) {
         console.warn('Warning: PRIVATE_KEY environment variable is required for sending transactions');
@@ -55,22 +50,56 @@ program
         console.error('Error: PRIVATE_KEY must start with 0x');
         process.exit(1);
     }
-    const chain = await getChain(rpcUrl);
-    const transport = new StdioServerTransport();
-    const server = createServer({
-        chain,
-        privateKey: privateKey,
-        gameContract: gameContract,
-    }, {
-        ethereum,
-        storageConfig: {
-            type: storage,
-            dataDir: storagePath,
-        },
+    return { rpcUrl, gameContract, privateKey, storage, storagePath };
+}
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// FACTORY THAT GENERATE THE Conquest Environment Used By Tools
+// ----------------------------------------------------------------------------
+/**
+ * Factory function to create the ConquestEnv from CLI options
+ */
+const envFactory = async () => {
+    const { rpcUrl, gameContract, privateKey, storage, storagePath } = gatherGlobalOptions(program);
+    return createConquestEnv({
+        rpcUrl,
+        gameContract,
+        privateKey,
+        storagePath,
     });
+};
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// MCP subcommand - starts the MCP server
+// ----------------------------------------------------------------------------
+program
+    .command('mcp')
+    .description('Start the MCP server')
+    .option('--ethereum', 'Whether to also provide tools-ethereum tools', process.env.ETHEREUM_TOOLS === 'true')
+    .action(async (options) => {
+    const env = await envFactory();
+    const ethereum = options.ethereum ?? process.env.ETHEREUM_TOOLS === 'true';
+    const transport = new StdioServerTransport();
+    const server = await createServer(env, { ethereum });
     await server.connect(transport);
 });
-// Register all tool commands dynamically
-registerAllToolCommands(program, tools);
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// Register all tool commands dynamically with the CLI config
+registerAllToolCommands(program, tools, envFactory);
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// HANDLE unknown command
+// ----------------------------------------------------------------------------
+const args = process.argv.slice(2);
+const registeredCommands = program.commands.map((cmd) => cmd.name());
+// Check if the first argument is a known command or a global flag
+const isKnown = registeredCommands.includes(args[0]) || args[0]?.startsWith('-');
+if (args.length > 0 && !isKnown) {
+    console.error(`error: unknown command: ${args[0]}`);
+    program.outputHelp();
+    process.exit(1);
+}
+// ----------------------------------------------------------------------------
 program.parse(process.argv);
 //# sourceMappingURL=cli.js.map

package/dist/cli.js.map

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

package/dist/contracts/space-info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"space-info.d.ts","sourceRoot":"","sources":["../../src/contracts/space-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,EAAC,yBAAyB,EAAE,cAAc,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzF,wBAAsB,eAAe,CACpC,OAAO,EAAE,yBAAyB,EAClC,YAAY,EAAE,YAAY,GACxB,OAAO,CAAC;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,cAAc,EAAE,cAAc,CAAA;CAAC,CAAC,CAkCjE"}
+{"version":3,"file":"space-info.d.ts","sourceRoot":"","sources":["../../src/contracts/space-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,EAAC,yBAAyB,EAAE,cAAc,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAazF,wBAAsB,eAAe,CACpC,OAAO,EAAE,yBAAyB,EAClC,YAAY,EAAE,YAAY,GACxB,OAAO,CAAC;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,cAAc,EAAE,cAAc,CAAA;CAAC,CAAC,CA8CjE"}

package/dist/contracts/space-info.js

@@ -1,22 +1,43 @@
 import { SpaceInfo } from 'conquest-eth-v0-contracts';
+// Minimal ABI for reading numTokensPerNativeTokenAt18Decimals from PlayToken
+const PlayTokenAbi = [
+    {
+        name: 'numTokensPerNativeTokenAt18Decimals',
+        type: 'function',
+        stateMutability: 'view',
+        inputs: [],
+        outputs: [{ type: 'uint256' }],
+    },
+];
 export async function createSpaceInfo(clients, gameContract) {
     // Fetch config from contract
     const config = await clients.publicClient.readContract({
         ...gameContract,
         functionName: 'getConfig',
     });
+    // Extract stakingToken address and fetch numTokensPerNativeToken from PlayToken contract
+    const stakingToken = config.stakingToken;
+    const numTokensPerNativeToken = await clients.publicClient.readContract({
+        address: stakingToken,
+        abi: PlayTokenAbi,
+        functionName: 'numTokensPerNativeTokenAt18Decimals',
+    });
     const contractConfig = {
         genesis: BigInt(config.genesis),
         resolveWindow: BigInt(config.resolveWindow),
         timePerDistance: BigInt(config.timePerDistance),
         exitDuration: BigInt(config.exitDuration),
         acquireNumSpaceships: Number(config.acquireNumSpaceships),
+        stakingToken,
+        numTokensPerNativeToken: BigInt(numTokensPerNativeToken),
     };
     // Create SpaceInfo instance with config
+    // Note: The contract's getConfig() returns timePerDistance already divided by 4 (see OuterSpaceFacetBase constructor).
+    // SpaceInfo also divides by 4 internally, so we need to multiply by 4 here to compensate.
     const spaceInfo = new SpaceInfo({
         genesis: config.genesis,
         resolveWindow: Number(config.resolveWindow),
-        timePerDistance: Number(config.timePerDistance),
+        timePerDistance: Number(config.timePerDistance) * 4,
         exitDuration: Number(config.exitDuration),
         acquireNumSpaceships: Number(config.acquireNumSpaceships),
         productionSpeedUp: Number(config.productionSpeedUp),

package/dist/contracts/space-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"space-info.js","sourceRoot":"","sources":["../../src/contracts/space-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AAGpD,MAAM,CAAC,KAAK,UAAU,eAAe,CACpC,OAAkC,EAClC,YAA0B;IAE1B,6BAA6B;IAC7B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;QACtD,GAAG,YAAY;QACf,YAAY,EAAE,WAAW;KACzB,CAAC,CAAC;IAEH,MAAM,cAAc,GAAmB;QACtC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;QAC/B,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3C,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QAC/C,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QACzC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;KACzD,CAAC;IAEF,wCAAwC;IACxC,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC,OAAwB;QACxC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3C,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QAC/C,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QACzC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;QACzD,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC;QACnD,uBAAuB,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;QAC/D,sCAAsC,EAAE,MAAM,CAAC,MAAM,CAAC,sCAAsC,CAAC;QAC7F,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;QACjD,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QAC/C,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC;QAC7D,uBAAuB,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;QAC/D,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC;KACnD,CAAC,CAAC;IAEH,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"space-info.js","sourceRoot":"","sources":["../../src/contracts/space-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AAGpD,6EAA6E;AAC7E,MAAM,YAAY,GAAG;IACpB;QACC,IAAI,EAAE,qCAAqC;QAC3C,IAAI,EAAE,UAAU;QAChB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAC,IAAI,EAAE,SAAS,EAAC,CAAC;KAC5B;CACQ,CAAC;AAEX,MAAM,CAAC,KAAK,UAAU,eAAe,CACpC,OAAkC,EAClC,YAA0B;IAE1B,6BAA6B;IAC7B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;QACtD,GAAG,YAAY;QACf,YAAY,EAAE,WAAW;KACzB,CAAC,CAAC;IAEH,yFAAyF;IACzF,MAAM,YAAY,GAAG,MAAM,CAAC,YAA6B,CAAC;IAC1D,MAAM,uBAAuB,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;QACvE,OAAO,EAAE,YAAY;QACrB,GAAG,EAAE,YAAY;QACjB,YAAY,EAAE,qCAAqC;KACnD,CAAC,CAAC;IAEH,MAAM,cAAc,GAAmB;QACtC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;QAC/B,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3C,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QAC/C,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QACzC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;QACzD,YAAY;QACZ,uBAAuB,EAAE,MAAM,CAAC,uBAAuB,CAAC;KACxD,CAAC;IAEF,wCAAwC;IACxC,uHAAuH;IACvH,0FAA0F;IAC1F,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC,OAAwB;QACxC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3C,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC;QACnD,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QACzC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;QACzD,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC;QACnD,uBAAuB,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;QAC/D,sCAAsC,EAAE,MAAM,CAAC,MAAM,CAAC,sCAAsC,CAAC;QAC7F,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;QACjD,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QAC/C,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC;QAC7D,uBAAuB,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;QAC/D,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC;KACnD,CAAC,CAAC;IAEH,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,CAAC;AACpC,CAAC"}

package/dist/fleet/resolve.d.ts

@@ -41,7 +41,7 @@ export declare function resolveFleetWithSpaceInfo(clients: Clients, gameContract
     reason: string;
 }>;
 /**
- * Get fleets that can be resolved (not yet resolved and past resolve window)
+ * Get fleets that can be resolved (arrived and still within resolve window)
  *
  * @param storage - Storage instance for tracking pending fleets
  * @param resolveWindow - The resolve window duration in seconds from contract config

package/dist/fleet/resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/fleet/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,MAAM,CAAC;AAChD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,OAAO,EAAmB,YAAY,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAGjF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CACjC,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,SAAS,OAAO,EAAE,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;CACvC,EACD,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,YAAY,GACnB,OAAO,CAAC;IAAC,QAAQ,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAC,GAAG;IAAC,QAAQ,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC,CAwDpF;AAED;;;;;;;;;GASG;AACH,wBAAsB,yBAAyB,CAC9C,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,YAAY,GACnB,OAAO,CAAC;IAAC,QAAQ,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAC,GAAG;IAAC,QAAQ,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC,CAkEpF;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACxC,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC,CASzB"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/fleet/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,MAAM,CAAC;AAChD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,OAAO,EAAmB,YAAY,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAGjF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CACjC,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,SAAS,OAAO,EAAE,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;CACvC,EACD,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,YAAY,GACnB,OAAO,CAAC;IAAC,QAAQ,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAC,GAAG;IAAC,QAAQ,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC,CAwDpF;AAED;;;;;;;;;GASG;AACH,wBAAsB,yBAAyB,CAC9C,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,YAAY,GACnB,OAAO,CAAC;IAAC,QAAQ,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAC,GAAG;IAAC,QAAQ,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC,CAkEpF;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACxC,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC,CAUzB"}

package/dist/fleet/resolve.js

@@ -122,7 +122,7 @@ export async function resolveFleetWithSpaceInfo(clients, gameContract, spaceInfo
     return { resolved: true, fleet: resolvedFleet };
 }
 /**
- * Get fleets that can be resolved (not yet resolved and past resolve window)
+ * Get fleets that can be resolved (arrived and still within resolve window)
  *
  * @param storage - Storage instance for tracking pending fleets
  * @param resolveWindow - The resolve window duration in seconds from contract config
@@ -132,9 +132,10 @@ export async function getResolvableFleets(storage, resolveWindow) {
     const currentTime = getCurrentTimestamp();
     const fleets = await storage.getResolvableFleets();
     return fleets.filter((fleet) => {
-        // Check if fleet is past the resolve window
-        const resolveWindowOpen = fleet.estimatedArrivalTime + Number(resolveWindow);
-        return !fleet.resolved && currentTime >= resolveWindowOpen;
+        // Fleet can be resolved after arrival but before resolve window closes
+        const arrivalTime = fleet.estimatedArrivalTime;
+        const resolveWindowEnd = arrivalTime + Number(resolveWindow);
+        return !fleet.resolved && currentTime >= arrivalTime && currentTime < resolveWindowEnd;
     });
 }
 //# sourceMappingURL=resolve.js.map

package/dist/fleet/resolve.js.map

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

package/dist/fleet/send.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/fleet/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,OAAO,EAAC,MAAM,MAAM,CAAC;AAC/C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAIrF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,SAAS,CAC9B,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;IACT,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CACvB,GACC,OAAO,CAAC,YAAY,CAAC,CAuEvB"}
+{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/fleet/send.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,OAAO,EAAC,MAAM,MAAM,CAAC;AAC/C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAGrF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,SAAS,CAC9B,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE;IACT,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CACvB,GACC,OAAO,CAAC,YAAY,CAAC,CAyEvB"}

package/dist/fleet/send.js

@@ -1,6 +1,5 @@
 import { zeroAddress } from 'viem';
 import { computeFleetId, computeToHash, generateSecret } from '../util/hashing.js';
-import { calculateEstimatedArrivalTime, getCurrentTimestamp } from '../util/time.js';
 /**
  * Send a fleet to a destination planet
  *
@@ -32,12 +31,13 @@ export async function sendFleet(clients, gameContract, fromPlanetId, toPlanetId,
     const distance = spaceInfo.distance(fromPlanet, toPlanet);
     // Generate secret if not provided
     const secret = options?.secret || generateSecret();
-    // Calculate estimated arrival time using contract config
-    const estimatedArrivalTime = calculateEstimatedArrivalTime({
-        startTime: BigInt(getCurrentTimestamp()),
-        distance: BigInt(distance),
-        timePerDistance: contractConfig.timePerDistance,
-    });
+    // Get current blockchain timestamp (not local time) for accurate arrival calculation
+    const block = await clients.publicClient.getBlock();
+    const blockTimestamp = Number(block.timestamp);
+    // Calculate estimated arrival time using SpaceInfo which accounts for planet speed
+    // The travel time formula is: distance * (timePerDistance * 10000) / speed
+    const travelTime = spaceInfo.timeToArrive(fromPlanet, toPlanet);
+    const estimatedArrivalTime = blockTimestamp + travelTime;
     const parameters = {
         gift: options?.gift ?? false,
         specific: options?.specific ?? zeroAddress,
@@ -66,7 +66,7 @@ export async function sendFleet(clients, gameContract, fromPlanetId, toPlanetId,
         arrivalTimeWanted: parameters.arrivalTimeWanted,
         fleetSender,
         operator,
-        committedAt: getCurrentTimestamp(),
+        committedAt: blockTimestamp,
         estimatedArrivalTime,
         resolved: false,
     };

package/dist/fleet/send.js.map

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

package/dist/index.d.ts

@@ -1,36 +1,10 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { Implementation } from '@modelcontextprotocol/sdk/types.js';
-import { Chain } from 'viem';
-import { ServerOptions } from '@modelcontextprotocol/sdk/server';
+import type { ConquestEnv, EnvFactoryOptions } from './types.js';
 /**
- * Create and configure an MCP server for Conquest.eth game interactions
+ * Factory function to create the ConquestEnv
+ * This is shared between CLI and MCP server
  *
- * @param params - Configuration parameters for the server
- * @param params.chain - The blockchain chain to connect to
- * @param params.privateKey - Optional private key for signing transactions (wallet operations)
- * @param params.gameContract - The game contract address
- * @param options - Optional server configuration
- * @param options.ethereum - Whether to include Ethereum MCP tools (default: false)
- * @param options.rpcURL - Optional custom RPC URL
- * @param options.serverOptions - Optional MCP server options
- * @param options.serverInfo - Optional server metadata to override defaults
- * @param options.storageConfig - Storage configuration for fleets and exits
- * @param options.storageConfig.type - Storage type ('json' or 'sqlite')
- * @param options.storageConfig.dataDir - Optional data directory path
- * @returns Configured MCP server instance with Conquest game tools registered
+ * @param options - Configuration options for creating the environment
+ * @returns ConquestEnv with fleetManager and planetManager
  */
-export declare function createServer(params: {
-    chain: Chain;
-    privateKey?: `0x${string}`;
-    gameContract: `0x${string}`;
-}, options?: {
-    ethereum?: boolean;
-    rpcURL?: string;
-    serverOptions?: ServerOptions;
-    serverInfo?: Implementation;
-    storageConfig?: {
-        type: 'json' | 'sqlite';
-        dataDir?: string;
-    };
-}): McpServer;
+export declare function createConquestEnv(options: EnvFactoryOptions): Promise<ConquestEnv>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,yCAAyC,CAAC;AAElE,OAAO,EAAC,cAAc,EAAC,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAC,KAAK,EAAC,MAAM,MAAM,CAAC;AAC3B,OAAO,EAAC,aAAa,EAAC,MAAM,kCAAkC,CAAC;AAe/D;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,YAAY,CAC3B,MAAM,EAAE;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,UAAU,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAAC,YAAY,EAAE,KAAK,MAAM,EAAE,CAAA;CAAC,EAC/E,OAAO,CAAC,EAAE;IACT,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,aAAa,CAAC,EAAE;QAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CAC5D,aAwID"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAEX,WAAW,EACX,iBAAiB,EAEjB,MAAM,YAAY,CAAC;AAIpB;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC,CAyBxF"}