Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/server-platform-agnostic.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@agentxjs/server": patch
---

Make @agentxjs/server platform-agnostic by removing @agentxjs/node-platform dependency. ServerConfig.platform now accepts AgentXPlatform directly. Replace commonxjs/logger with @deepracticex/logger.
9 changes: 5 additions & 4 deletions apps/cli/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ async function getServerUrl(port: number): Promise<{ url: string; cleanup?: () =
});
};

const platform = await nodePlatform({
dataPath,
// logDir already configured at startup
}).resolve();
const server = await createServer({
platform: nodePlatform({
dataPath,
// logDir already configured at startup
}),
platform,
createDriver: wrappedCreateDriver,
port,
host: "127.0.0.1",
Expand Down
3 changes: 2 additions & 1 deletion apps/portagent/lib/agentx/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ export async function startAgentXServer(): Promise<void> {
hasApiKey: !!initialConfig.apiKey,
});

const platform = await nodePlatform({ dataPath }).resolve();
const config: ServerConfig = {
platform: nodePlatform({ dataPath }),
platform,
createDriver: (driverConfig: DriverConfig) => {
// Read latest config from DB on each agent creation
const llm = getLLMConfigFromDB();
Expand Down
26 changes: 14 additions & 12 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions packages/server/bin/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import type { CreateDriver } from "@agentxjs/core/driver";
import { createMonoDriver } from "@agentxjs/mono-driver";
import { nodePlatform } from "@agentxjs/node-platform";
import { createLogger } from "commonxjs/logger";
import { createLogger } from "@deepracticex/logger";
import { createServer } from "../src";

const logger = createLogger("server/bin");
Expand Down Expand Up @@ -61,11 +61,9 @@ async function main() {
};

// Create server with nodePlatform + driver
const platform = await nodePlatform({ dataPath, logDir }).resolve();
const server = await createServer({
platform: nodePlatform({
dataPath,
logDir,
}),
platform,
createDriver: wrappedCreateDriver,
port,
host,
Expand Down
6 changes: 3 additions & 3 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
},
"dependencies": {
"@agentxjs/core": "workspace:*",
"@agentxjs/node-platform": "workspace:*",
"@agentxjs/mono-driver": "workspace:*",
"commonxjs": "^0.1.1"
"@deepracticex/logger": "^1.2.0"
},
"devDependencies": {
"@agentxjs/node-platform": "workspace:*",
"@agentxjs/mono-driver": "workspace:*",
"typescript": "^5.3.3"
}
}
2 changes: 1 addition & 1 deletion packages/server/src/CommandHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import type { UserContentPart } from "@agentxjs/core/agent";
import type { RpcMethod } from "@agentxjs/core/network";
import type { AgentXRuntime } from "@agentxjs/core/runtime";
import { createLogger } from "commonxjs/logger";
import { createLogger } from "@deepracticex/logger";

const logger = createLogger("server/CommandHandler");

Expand Down
15 changes: 4 additions & 11 deletions packages/server/src/Server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ import {
} from "@agentxjs/core/network";
import type { AgentXPlatform } from "@agentxjs/core/runtime";
import { createAgentXRuntime } from "@agentxjs/core/runtime";
import { type DeferredPlatformConfig, isDeferredPlatform } from "@agentxjs/node-platform";
import { createLogger } from "commonxjs/logger";
import { createLogger } from "@deepracticex/logger";
import { CommandHandler } from "./CommandHandler";
import type { AgentXServer } from "./types";

Expand All @@ -46,11 +45,9 @@ interface ConnectionState {
*/
export interface ServerConfig {
/**
* AgentX Platform (can be AgentXPlatform or DeferredPlatformConfig)
*
* Must provide `channelServer` for accepting WebSocket connections.
* AgentX Platform — must provide `channelServer` for accepting WebSocket connections.
*/
platform: AgentXPlatform | DeferredPlatformConfig;
platform: AgentXPlatform;

/**
* LLM Driver factory function - creates Driver per Agent
Expand Down Expand Up @@ -88,11 +85,7 @@ export interface ServerConfig {
*/
export async function createServer(config: ServerConfig): Promise<AgentXServer> {
const { wsPath = "/ws" } = config;

// Resolve deferred platform if needed
const platform: AgentXPlatform = isDeferredPlatform(config.platform)
? await config.platform.resolve()
: config.platform;
const platform = config.platform;

// Create runtime from platform + driver
const runtime = createAgentXRuntime(platform, config.createDriver);
Expand Down