diff --git a/services/minecraft/src/agents/action/adapter.test.ts b/services/minecraft/src/agents/action/adapter.test.ts index 828a0c54c..29dc7208e 100644 --- a/services/minecraft/src/agents/action/adapter.test.ts +++ b/services/minecraft/src/agents/action/adapter.test.ts @@ -1,10 +1,10 @@ import { messages, system, user } from 'neuri/openai' import { beforeAll, describe, expect, it } from 'vitest' +import { generateSystemBasicPrompt } from '../../cognitive/conscious/prompt' import { initBot, useBot } from '../../composables/bot' import { config, initEnv } from '../../composables/config' import { createNeuriAgent } from '../../composables/neuri' -import { generateSystemBasicPrompt } from '../../libs/llm-agent/prompt' import { initLogger } from '../../utils/logger' describe('openAI agent', { timeout: 0 }, () => { diff --git a/services/minecraft/src/agents/action/adapter.ts b/services/minecraft/src/agents/action/adapter.ts index 90e16e00b..60fdd245c 100644 --- a/services/minecraft/src/agents/action/adapter.ts +++ b/services/minecraft/src/agents/action/adapter.ts @@ -7,7 +7,7 @@ import type { PlanStep } from '../planning/adapter' import { agent } from 'neuri' import { system, user } from 'neuri/openai' -import { BaseLLMHandler } from '../../libs/llm-agent/handler' +import { BaseLLMHandler } from '../../cognitive/conscious/handler' import { useLogger } from '../../utils/logger' import { generateActionSystemPrompt } from './system-prompt' import { actionsList } from './tools' diff --git a/services/minecraft/src/agents/action/tools.test.ts b/services/minecraft/src/agents/action/tools.test.ts index 74554766d..667959031 100644 --- a/services/minecraft/src/agents/action/tools.test.ts +++ b/services/minecraft/src/agents/action/tools.test.ts @@ -2,10 +2,10 @@ import { sleep } from '@moeru/std' import { messages, system, user } from 'neuri/openai' import { beforeAll, describe, expect, it } from 'vitest' +import { generateActionAgentPrompt } from '../../cognitive/conscious/prompt' import { initBot, useBot } from '../../composables/bot' import { config, initEnv } from '../../composables/config' import { createNeuriAgent } from '../../composables/neuri' -import { generateActionAgentPrompt } from '../../libs/llm-agent/prompt' import { initLogger } from '../../utils/logger' describe('actions agent', { timeout: 0 }, () => { diff --git a/services/minecraft/src/agents/chat/adapter.ts b/services/minecraft/src/agents/chat/adapter.ts index bc03b45a9..51c63b43d 100644 --- a/services/minecraft/src/agents/chat/adapter.ts +++ b/services/minecraft/src/agents/chat/adapter.ts @@ -2,7 +2,7 @@ import type { ChatHistory } from './types' import { system, user } from 'neuri/openai' -import { BaseLLMHandler } from '../../libs/llm-agent/handler' +import { BaseLLMHandler } from '../../cognitive/conscious/handler' export function generateChatAgentPrompt(): string { return `You are a Minecraft bot assistant. Your task is to engage in natural conversation with players while helping them achieve their goals. diff --git a/services/minecraft/src/agents/planning/adapter.ts b/services/minecraft/src/agents/planning/adapter.ts index 8426a41df..926b3dad7 100644 --- a/services/minecraft/src/agents/planning/adapter.ts +++ b/services/minecraft/src/agents/planning/adapter.ts @@ -5,7 +5,7 @@ import type { Action } from '../../libs/mineflayer/action' import { agent } from 'neuri' import { system, user } from 'neuri/openai' -import { BaseLLMHandler } from '../../libs/llm-agent/handler' +import { BaseLLMHandler } from '../../cognitive/conscious/handler' import { generatePlanningAgentSystemPrompt } from './system-prompt' export async function createPlanningNeuriAgent(): Promise { diff --git a/services/minecraft/src/libs/llm-agent/completion.ts b/services/minecraft/src/cognitive/conscious/completion.ts similarity index 95% rename from services/minecraft/src/libs/llm-agent/completion.ts rename to services/minecraft/src/cognitive/conscious/completion.ts index c0a78ebff..9b8daeb41 100644 --- a/services/minecraft/src/libs/llm-agent/completion.ts +++ b/services/minecraft/src/cognitive/conscious/completion.ts @@ -2,7 +2,7 @@ import type { NeuriContext } from 'neuri' import type { ChatCompletion } from 'neuri/openai' import type { Logger } from '../../utils/logger' -import type { MineflayerWithAgents } from './types' +import type { MineflayerWithAgents } from '../types' import { assistant } from 'neuri/openai' diff --git a/services/minecraft/src/libs/llm-agent/handler.ts b/services/minecraft/src/cognitive/conscious/handler.ts similarity index 96% rename from services/minecraft/src/libs/llm-agent/handler.ts rename to services/minecraft/src/cognitive/conscious/handler.ts index 2c5c5247e..a07765aa9 100644 --- a/services/minecraft/src/libs/llm-agent/handler.ts +++ b/services/minecraft/src/cognitive/conscious/handler.ts @@ -2,7 +2,7 @@ import type { NeuriContext } from 'neuri' import type { ChatCompletion, Message } from 'neuri/openai' import type { Logger } from '../../utils/logger' -import type { LLMConfig, LLMResponse } from './types' +import type { LLMConfig, LLMResponse } from '../types' import { withRetry } from '@moeru/std' diff --git a/services/minecraft/src/libs/llm-agent/orchestrator.ts b/services/minecraft/src/cognitive/conscious/orchestrator.ts similarity index 97% rename from services/minecraft/src/libs/llm-agent/orchestrator.ts rename to services/minecraft/src/cognitive/conscious/orchestrator.ts index 4f29c9877..045b32354 100644 --- a/services/minecraft/src/libs/llm-agent/orchestrator.ts +++ b/services/minecraft/src/cognitive/conscious/orchestrator.ts @@ -1,8 +1,8 @@ import type { Logg } from '@guiiai/logg' import type { Neuri, NeuriContext } from 'neuri' -import type { EventManager } from './event-manager' -import type { BotEvent, MineflayerWithAgents, UserIntentPayload } from './types' +import type { EventManager } from '../perception/event-manager' +import type { BotEvent, MineflayerWithAgents, UserIntentPayload } from '../types' import { withRetry } from '@moeru/std' import { system, user } from 'neuri/openai' diff --git a/services/minecraft/src/libs/llm-agent/prompt.ts b/services/minecraft/src/cognitive/conscious/prompt.ts similarity index 96% rename from services/minecraft/src/libs/llm-agent/prompt.ts rename to services/minecraft/src/cognitive/conscious/prompt.ts index 61591b7a4..2dfacdb2f 100644 --- a/services/minecraft/src/libs/llm-agent/prompt.ts +++ b/services/minecraft/src/cognitive/conscious/prompt.ts @@ -1,4 +1,4 @@ -import type { Mineflayer } from '../mineflayer' +import type { Mineflayer } from '../../libs/mineflayer' import { listInventory } from '../../skills/actions/inventory' diff --git a/services/minecraft/src/libs/llm-agent/container.ts b/services/minecraft/src/cognitive/container.ts similarity index 87% rename from services/minecraft/src/libs/llm-agent/container.ts rename to services/minecraft/src/cognitive/container.ts index 1a6fa8727..cac067eed 100644 --- a/services/minecraft/src/libs/llm-agent/container.ts +++ b/services/minecraft/src/cognitive/container.ts @@ -4,11 +4,11 @@ import type { Neuri } from 'neuri' import { useLogg } from '@guiiai/logg' import { asClass, asFunction, createContainer, InjectionMode } from 'awilix' -import { ActionAgentImpl } from '../../agents/action' -import { ChatAgentImpl } from '../../agents/chat' -import { PlanningAgentImpl } from '../../agents/planning' -import { EventManager } from './event-manager' -import { Orchestrator } from './orchestrator' +import { ActionAgentImpl } from '../agents/action' +import { ChatAgentImpl } from '../agents/chat' +import { PlanningAgentImpl } from '../agents/planning' +import { Orchestrator } from './conscious/orchestrator' +import { EventManager } from './perception/event-manager' import { ReflexManager } from './reflex/reflex-manager' export interface ContainerServices { diff --git a/services/minecraft/src/libs/llm-agent/index.ts b/services/minecraft/src/cognitive/index.ts similarity index 92% rename from services/minecraft/src/libs/llm-agent/index.ts rename to services/minecraft/src/cognitive/index.ts index 38876f3d5..849454c12 100644 --- a/services/minecraft/src/libs/llm-agent/index.ts +++ b/services/minecraft/src/cognitive/index.ts @@ -1,12 +1,12 @@ -import type { MineflayerPlugin } from '../mineflayer' +import type { MineflayerPlugin } from '../libs/mineflayer' import type { LLMAgentOptions, MineflayerWithAgents } from './types' import { system } from 'neuri/openai' -import { config } from '../../composables/config' -import { ChatMessageHandler } from '../mineflayer' +import { config } from '../composables/config' +import { ChatMessageHandler } from '../libs/mineflayer' +import { generateActionAgentPrompt } from './conscious/prompt' import { createAgentContainer } from './container' -import { generateActionAgentPrompt } from './prompt' export function LLMAgent(options: LLMAgentOptions): MineflayerPlugin { return { diff --git a/services/minecraft/src/libs/llm-agent/event-manager.ts b/services/minecraft/src/cognitive/perception/event-manager.ts similarity index 94% rename from services/minecraft/src/libs/llm-agent/event-manager.ts rename to services/minecraft/src/cognitive/perception/event-manager.ts index 2f222c29b..a3378903d 100644 --- a/services/minecraft/src/libs/llm-agent/event-manager.ts +++ b/services/minecraft/src/cognitive/perception/event-manager.ts @@ -1,4 +1,4 @@ -import type { BotEvent, EventType } from './types' +import type { BotEvent, EventType } from '../types' import EventEmitter from 'eventemitter3' diff --git a/services/minecraft/src/libs/llm-agent/reflex/reflex-manager.ts b/services/minecraft/src/cognitive/reflex/reflex-manager.ts similarity index 94% rename from services/minecraft/src/libs/llm-agent/reflex/reflex-manager.ts rename to services/minecraft/src/cognitive/reflex/reflex-manager.ts index f05def0cf..68bb42037 100644 --- a/services/minecraft/src/libs/llm-agent/reflex/reflex-manager.ts +++ b/services/minecraft/src/cognitive/reflex/reflex-manager.ts @@ -1,6 +1,6 @@ import type { Logg } from '@guiiai/logg' -import type { EventManager } from '../event-manager' +import type { EventManager } from '../perception/event-manager' import type { BotEvent, MineflayerWithAgents, UserIntentPayload } from '../types' export class ReflexManager { diff --git a/services/minecraft/src/libs/llm-agent/types.ts b/services/minecraft/src/cognitive/types.ts similarity index 89% rename from services/minecraft/src/libs/llm-agent/types.ts rename to services/minecraft/src/cognitive/types.ts index 7e9ddd3e2..30bdf1a0d 100644 --- a/services/minecraft/src/libs/llm-agent/types.ts +++ b/services/minecraft/src/cognitive/types.ts @@ -1,8 +1,8 @@ import type { Client } from '@proj-airi/server-sdk' import type { Neuri } from 'neuri' -import type { Mineflayer } from '../mineflayer' -import type { ActionAgent, ChatAgent, PlanningAgent } from '../mineflayer/base-agent' +import type { Mineflayer } from '../libs/mineflayer' +import type { ActionAgent, ChatAgent, PlanningAgent } from '../libs/mineflayer/base-agent' export interface LLMConfig { agent: Neuri diff --git a/services/minecraft/src/main.ts b/services/minecraft/src/main.ts index 306ec4ea1..94251799e 100644 --- a/services/minecraft/src/main.ts +++ b/services/minecraft/src/main.ts @@ -9,11 +9,11 @@ import { pathfinder as MineflayerPathfinder } from 'mineflayer-pathfinder' import { plugin as MineflayerPVP } from 'mineflayer-pvp' import { plugin as MineflayerTool } from 'mineflayer-tool' +import { LLMAgent } from './cognitive' import { initBot } from './composables/bot' import { config, initEnv } from './composables/config' import { createNeuriAgent } from './composables/neuri' import { DebugServer } from './debug-server' -import { LLMAgent } from './libs/llm-agent' import { wrapPlugin } from './libs/mineflayer' import { initLogger, useLogger } from './utils/logger'