refactor: move world to skills & move manager to folder

src/agents/action/index.ts

@@ -2,9 +2,9 @@ import type { Mineflayer } from '../../libs/mineflayer'
 import type { Action } from '../../libs/mineflayer/action'
 import type { ActionAgent, AgentConfig } from '../../libs/mineflayer/base-agent'
 
-import { ActionManager } from '../../composables/action'
 import { useBot } from '../../composables/bot'
 import { AbstractAgent } from '../../libs/mineflayer/base-agent'
+import { ActionManager } from '../../manager/action'
 import { actionsList } from './tools'
 
 interface ActionState {

src/agents/action/tools.ts

@@ -3,11 +3,11 @@ import type { Action } from '../../libs/mineflayer'
 import { useLogg } from '@guiiai/logg'
 import { z } from 'zod'
 
-import * as world from '../../composables/world'
 import * as skills from '../../skills'
 import { collectBlock } from '../../skills/actions/collect-block'
 import { discard, equip, putInChest, takeFromChest, viewChest } from '../../skills/actions/inventory'
 import { activateNearestBlock, placeBlock } from '../../skills/actions/world-interactions'
+import * as world from '../../skills/world'
 
 // Utils
 const pad = (str: string): string => `\n${str}\n`

src/agents/chat/llm.ts

@@ -4,7 +4,7 @@ import type { ChatHistory } from './types'
 import { useLogg } from '@guiiai/logg'
 import { system, user } from 'neuri/openai'
 
-import { toRetriable } from '../../utils/reliability'
+import { toRetriable } from '../../utils/helper'
 import { genChatAgentPrompt } from '../prompt/chat'
 
 const logger = useLogg('chat-llm').useGlobalConfig()

src/agents/planning/llm.ts

@@ -4,7 +4,7 @@ import type { Action } from '../../libs/mineflayer/action'
 import { useLogg } from '@guiiai/logg'
 import { system, user } from 'neuri/openai'
 
-import { toRetriable } from '../../utils/reliability'
+import { toRetriable } from '../../utils/helper'
 import { generatePlanningAgentSystemPrompt, generatePlanningAgentUserPrompt } from '../prompt/planning'
 
 const logger = useLogg('planning-llm').useGlobalConfig()

src/agents/prompt/llm-agent.plugin.ts

@@ -3,13 +3,12 @@ import type { Mineflayer } from '../../libs/mineflayer'
 import { listInventory } from '../../skills/actions/inventory'
 
 export function generateSystemBasicPrompt(botName: string): string {
+  // ${ctx.prompt.selfPrompt}
   return `You are a playful Minecraft bot named ${botName} that can converse with players, see, move,
 mine, build, and interact with the world by using commands.`
 }
 
 export function generateActionAgentPrompt(mineflayer: Mineflayer): string {
-  // ${ctx.prompt.selfPrompt}
-
   return `${generateSystemBasicPrompt(mineflayer.username)}
 
 Act human-like as if you were a typical Minecraft player, rather than an AI. Be very brief in
@@ -24,28 +23,28 @@ Do not use any emojis. Just call the function given you if needed.
 }
 
 export async function generateStatusPrompt(mineflayer: Mineflayer): Promise<string> {
+  // Get inventory items
   const inventory = await listInventory(mineflayer)
-  if (inventory.length === 0) {
-    return `I will give you the following information:
-${mineflayer.status.toOneLiner()}
 
-Inventory:
-[Empty]
-
-Item in hand:
-[Empty]
-`
-  }
-  const inventoryStr = inventory.map(item => `${item.name} x ${item.count}`).join(', ')
-  const itemInHand = `${inventory[0].name} x ${inventory[0].count}` // TODO: mock
-
-  return `I will give you the following information:
-${mineflayer.status.toOneLiner()}
-
-Inventory:
-${inventoryStr}
-
-Item in hand:
-${itemInHand}
-`
+  // Format inventory string
+  const inventoryStr = inventory.length === 0
+    ? '[Empty]'
+    : inventory.map(item => `${item.name} x ${item.count}`).join(', ')
+
+  // Get currently held item
+  const itemInHand = inventory.length === 0
+    ? '[Empty]'
+    : `${inventory[0].name} x ${inventory[0].count}` // TODO: mock
+
+  // Build status message
+  return [
+    'I will give you the following information:',
+    mineflayer.status.toOneLiner(),
+    '',
+    'Inventory:',
+    inventoryStr,
+    '',
+    'Item in hand:',
+    itemInHand,
+  ].join('\n')
 }

src/libs/llm/base.ts

@@ -2,7 +2,7 @@ import type { LLMConfig, LLMResponse } from './types'
 
 import { useLogg } from '@guiiai/logg'
 
-import { toRetriable } from '../../utils/reliability'
+import { toRetriable } from '../../utils/helper'
 
 export abstract class BaseLLMHandler {
   protected logger = useLogg('llm-handler').useGlobalConfig()

src/plugins/llm-agent.ts

@@ -11,7 +11,7 @@ import { assistant, system, user } from 'neuri/openai'
 import { generateActionAgentPrompt, generateStatusPrompt } from '../agents/prompt/llm-agent.plugin'
 import { createAppContainer } from '../container'
 import { ChatMessageHandler } from '../libs/mineflayer/message'
-import { toRetriable } from '../utils/reliability'
+import { toRetriable } from '../utils/helper'
 
 interface MineflayerWithAgents extends Mineflayer {
   planning: PlanningAgent

src/skills/actions/collect-block.ts

@@ -4,8 +4,8 @@ import type { Mineflayer } from '../../libs/mineflayer'
 import { useLogg } from '@guiiai/logg'
 import pathfinder from 'mineflayer-pathfinder'
 
-import { getNearestBlocks } from '../../composables/world'
 import { breakBlockAt } from '../blocks'
+import { getNearestBlocks } from '../world'
 import { ensurePickaxe } from './ensure'
 import { pickupNearbyItems } from './world-interactions'
 

src/skills/actions/gather-wood.ts

@@ -2,10 +2,10 @@ import type { Mineflayer } from '../../libs/mineflayer'
 
 import { useLogg } from '@guiiai/logg'
 
-import { getNearestBlocks } from '../../composables/world'
 import { sleep } from '../../utils/helper'
 import { breakBlockAt } from '../blocks'
 import { goToPosition, moveAway } from '../movement'
+import { getNearestBlocks } from '../world'
 import { pickupNearbyItems } from './world-interactions'
 
 const logger = useLogg('Action:GatherWood').useGlobalConfig()

src/skills/actions/inventory.ts

@@ -3,8 +3,8 @@ import type { Mineflayer } from '../../libs/mineflayer'
 
 import { useLogg } from '@guiiai/logg'
 
-import { getNearestBlock } from '../../composables/world'
 import { goToPlayer, goToPosition } from '../movement'
+import { getNearestBlock } from '../world'
 
 const logger = useLogg('Action:Inventory').useGlobalConfig()
 

src/skills/blocks.ts

@@ -4,10 +4,10 @@ import type { BlockFace } from './base'
 import pathfinderModel, { type SafeBlock } from 'mineflayer-pathfinder'
 import { Vec3 } from 'vec3'
 
-import { getNearestBlock, getNearestBlocks, getPosition, shouldPlaceTorch } from '../composables/world'
 import { getBlockId, makeItem } from '../utils/mcdata'
 import { log } from './base'
 import { goToPosition } from './movement'
+import { getNearestBlock, getNearestBlocks, getPosition, shouldPlaceTorch } from './world'
 
 const { goals, Movements } = pathfinderModel
 

src/skills/combat.ts

@@ -4,10 +4,10 @@ import type { Mineflayer } from '../libs/mineflayer'
 
 import pathfinderModel from 'mineflayer-pathfinder'
 
-import { getNearbyEntities, getNearestEntityWhere } from '../composables/world'
 import { sleep } from '../utils/helper'
 import { isHostile } from '../utils/mcdata'
 import { log } from './base'
+import { getNearbyEntities, getNearestEntityWhere } from './world'
 
 const { goals } = pathfinderModel
 

src/skills/crafting.ts

@@ -5,11 +5,11 @@ import type { Mineflayer } from '../libs/mineflayer'
 
 import { useLogg } from '@guiiai/logg'
 
-import { getInventoryCounts, getNearestBlock, getNearestFreeSpace } from '../composables/world'
 import { getItemId, getItemName } from '../utils/mcdata'
 import { ensureCraftingTable } from './actions/ensure'
 import { collectBlock, placeBlock } from './blocks'
 import { goToNearestBlock, goToPosition, moveAway } from './movement'
+import { getInventoryCounts, getNearestBlock, getNearestFreeSpace } from './world'
 
 const logger = useLogg('Skill:Crafting').useGlobalConfig()
 

src/skills/inventory.ts

@@ -1,8 +1,8 @@
 import type { Mineflayer } from '../libs/mineflayer'
 
-import { getNearestBlock } from '../composables/world'
 import { log } from './base'
 import { goToPlayer, goToPosition } from './movement'
+import { getNearestBlock } from './world'
 
 export async function equip(mineflayer: Mineflayer, itemName: string): Promise<boolean> {
   const item = mineflayer.bot.inventory.slots.find(slot => slot && slot.name === itemName)

src/skills/movement.ts

@@ -6,9 +6,9 @@ import { randomInt } from 'es-toolkit'
 import pathfinder from 'mineflayer-pathfinder'
 import { Vec3 } from 'vec3'
 
-import { getNearestBlock, getNearestEntityWhere } from '../composables/world'
 import { sleep } from '../utils/helper'
 import { log } from './base'
+import { getNearestBlock, getNearestEntityWhere } from './world'
 
 const logger = useLogg('Skill:Movement').useGlobalConfig()
 const { goals, Movements } = pathfinder

src/utils/helper.ts

@@ -1 +1,39 @@
 export const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
+
+/**
+ * Returns a retirable anonymous function with configured retryLimit and delayInterval
+ *
+ * @param retryLimit Number of retry attempts
+ * @param delayInterval Delay between retries in milliseconds
+ * @param func Function to be called
+ * @returns A wrapped function with the same signature as func
+ */
+export function toRetriable<A, R>(
+  retryLimit: number,
+  delayInterval: number,
+  func: (...args: A[]) => Promise<R>,
+  hooks?: {
+    onError?: (err: unknown) => void
+  },
+): (...args: A[]) => Promise<R> {
+  let retryCount = 0
+  return async function (args: A): Promise<R> {
+    try {
+      return await func(args)
+    }
+    catch (err) {
+      if (hooks?.onError) {
+        hooks.onError(err)
+      }
+
+      if (retryCount < retryLimit) {
+        retryCount++
+        await sleep(delayInterval)
+        return await toRetriable(retryLimit - retryCount, delayInterval, func)(args)
+      }
+      else {
+        throw err
+      }
+    }
+  }
+}