mirror of
https://github.com/multica-ai/multica.git
synced 2026-07-26 12:35:35 +02:00
refactor(hub): replace mock Agent with AsyncAgent
Hub now uses AsyncAgent from src/agent/ instead of its own Agent implementation. Deleted hub/agent.ts and hub/channel.ts as they are no longer needed. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,87 +0,0 @@
|
||||
import { v7 as uuidv7 } from "uuid";
|
||||
import { Agent as CoreAgent } from "../agent/runner.js";
|
||||
import { Channel } from "./channel.js";
|
||||
import type { Message } from "./types.js";
|
||||
|
||||
/**
|
||||
* Agent — uses pi-agent-core for real inference.
|
||||
* write() triggers a model run, read() outputs streaming results.
|
||||
*/
|
||||
export class Agent {
|
||||
readonly id: string;
|
||||
private readonly channel = new Channel<Message>();
|
||||
private _closed = false;
|
||||
private readonly agent: CoreAgent;
|
||||
private queue: Promise<void> = Promise.resolve();
|
||||
|
||||
constructor(id?: string) {
|
||||
this.id = id ?? uuidv7();
|
||||
this.agent = new CoreAgent({
|
||||
logger: {
|
||||
stdout: this.createChannelStream("[assistant] "),
|
||||
stderr: this.createChannelStream("[tool] "),
|
||||
},
|
||||
sessionId: this.id,
|
||||
});
|
||||
}
|
||||
|
||||
get closed(): boolean {
|
||||
return this._closed;
|
||||
}
|
||||
|
||||
/** Write message to agent (non-blocking, serialized queue) */
|
||||
write(content: string): void {
|
||||
if (this._closed) {
|
||||
throw new Error("Agent is closed");
|
||||
}
|
||||
|
||||
this.queue = this.queue
|
||||
.then(async () => {
|
||||
const result = await this.agent.run(content);
|
||||
if (result.error) {
|
||||
this.channel.send({
|
||||
id: uuidv7(),
|
||||
content: `[error] ${result.error}`,
|
||||
});
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
const message = err instanceof Error ? err.message : String(err);
|
||||
this.channel.send({ id: uuidv7(), content: `[error] ${message}` });
|
||||
});
|
||||
}
|
||||
|
||||
/** Continuously read message stream */
|
||||
read(): AsyncIterable<Message> {
|
||||
return this.channel;
|
||||
}
|
||||
|
||||
/** Close agent, stop all reads */
|
||||
close(): void {
|
||||
if (this._closed) return;
|
||||
this._closed = true;
|
||||
this.channel.close();
|
||||
}
|
||||
|
||||
private createChannelStream(prefix: string): NodeJS.WritableStream {
|
||||
let buffer = "";
|
||||
return {
|
||||
write: (chunk: any) => {
|
||||
if (this._closed) return false;
|
||||
const text =
|
||||
typeof chunk === "string"
|
||||
? chunk
|
||||
: chunk?.toString?.() ?? String(chunk);
|
||||
if (!text) return true;
|
||||
buffer += text;
|
||||
const parts = buffer.split("\n");
|
||||
buffer = parts.pop() ?? "";
|
||||
for (const part of parts) {
|
||||
if (part.length === 0) continue;
|
||||
this.channel.send({ id: uuidv7(), content: `${prefix}${part}` });
|
||||
}
|
||||
return true;
|
||||
},
|
||||
} as NodeJS.WritableStream;
|
||||
}
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
/**
|
||||
* Go channel style async iterable queue.
|
||||
* Supports multiple writers, single reader, iteration ends after close.
|
||||
*/
|
||||
export class Channel<T> implements AsyncIterable<T> {
|
||||
private buffer: T[] = [];
|
||||
private closed = false;
|
||||
|
||||
private readers: Array<{
|
||||
resolve: (result: IteratorResult<T>) => void;
|
||||
}> = [];
|
||||
|
||||
get isClosed(): boolean {
|
||||
return this.closed;
|
||||
}
|
||||
|
||||
get size(): number {
|
||||
return this.buffer.length;
|
||||
}
|
||||
|
||||
/** Send value to channel. Returns false when channel is closed. */
|
||||
send(value: T): boolean {
|
||||
if (this.closed) return false;
|
||||
|
||||
const reader = this.readers.shift();
|
||||
if (reader) {
|
||||
reader.resolve({ value, done: false });
|
||||
return true;
|
||||
}
|
||||
|
||||
this.buffer.push(value);
|
||||
return true;
|
||||
}
|
||||
|
||||
/** Close channel, wake up all waiting readers. */
|
||||
close(): void {
|
||||
if (this.closed) return;
|
||||
this.closed = true;
|
||||
|
||||
for (const reader of this.readers) {
|
||||
reader.resolve({ value: undefined as T, done: true });
|
||||
}
|
||||
this.readers = [];
|
||||
}
|
||||
|
||||
[Symbol.asyncIterator](): AsyncIterator<T> {
|
||||
return {
|
||||
next: (): Promise<IteratorResult<T>> => {
|
||||
if (this.buffer.length > 0) {
|
||||
const value = this.buffer.shift()!;
|
||||
return Promise.resolve({ value, done: false });
|
||||
}
|
||||
|
||||
if (this.closed) {
|
||||
return Promise.resolve({ value: undefined as T, done: true });
|
||||
}
|
||||
|
||||
return new Promise<IteratorResult<T>>((resolve) => {
|
||||
this.readers.push({ resolve });
|
||||
});
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
import type { HubOptions } from "./types.js";
|
||||
import type { ConnectionState } from "../shared/gateway-sdk/types.js";
|
||||
import { Agent } from "./agent.js";
|
||||
import { AsyncAgent } from "../agent/async-agent.js";
|
||||
import { getDeviceId } from "./device.js";
|
||||
import { GatewayClient } from "../shared/gateway-sdk/client.js";
|
||||
|
||||
export class Hub {
|
||||
private readonly agents = new Map<string, Agent>();
|
||||
private readonly agents = new Map<string, AsyncAgent>();
|
||||
private readonly agentSenders = new Map<string, string>();
|
||||
private client: GatewayClient;
|
||||
url: string;
|
||||
@@ -82,7 +82,7 @@ export class Hub {
|
||||
}
|
||||
|
||||
/** Create new Agent, or rebuild with existing ID */
|
||||
createAgent(id?: string): Agent {
|
||||
createAgent(id?: string): AsyncAgent {
|
||||
if (id) {
|
||||
const existing = this.agents.get(id);
|
||||
if (existing && !existing.closed) {
|
||||
@@ -90,31 +90,31 @@ export class Hub {
|
||||
}
|
||||
}
|
||||
|
||||
const agent = new Agent(id);
|
||||
this.agents.set(agent.id, agent);
|
||||
const agent = new AsyncAgent({ sessionId: id });
|
||||
this.agents.set(agent.sessionId, agent);
|
||||
|
||||
// Internally consume messages produced by agent
|
||||
void this.consumeAgent(agent);
|
||||
|
||||
console.log(`Agent created: ${agent.id}`);
|
||||
console.log(`Agent created: ${agent.sessionId}`);
|
||||
return agent;
|
||||
}
|
||||
|
||||
/** Internally read agent output and send via Gateway */
|
||||
private async consumeAgent(agent: Agent): Promise<void> {
|
||||
private async consumeAgent(agent: AsyncAgent): Promise<void> {
|
||||
for await (const msg of agent.read()) {
|
||||
console.log(`[${agent.id}] ${msg.content}`);
|
||||
const targetDeviceId = this.agentSenders.get(agent.id);
|
||||
console.log(`[${agent.sessionId}] ${msg.content}`);
|
||||
const targetDeviceId = this.agentSenders.get(agent.sessionId);
|
||||
if (targetDeviceId) {
|
||||
this.client.send(targetDeviceId, "message", {
|
||||
agentId: agent.id,
|
||||
agentId: agent.sessionId,
|
||||
content: msg.content,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
getAgent(id: string): Agent | undefined {
|
||||
getAgent(id: string): AsyncAgent | undefined {
|
||||
return this.agents.get(id);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
export { Channel } from "./channel.js";
|
||||
export { Agent } from "./agent.js";
|
||||
export { Hub } from "./hub.js";
|
||||
export { getDeviceId } from "./device.js";
|
||||
export type { Message, HubOptions } from "./types.js";
|
||||
export type { HubOptions } from "./types.js";
|
||||
|
||||
Reference in New Issue
Block a user