@xalia/agent 0.6.2 → 0.6.3

package/src/test/responseAwaiter.test.ts

@@ -0,0 +1,103 @@
+import { expect } from "vitest";
+import { ResponseAwaiter } from "../chat/utils/responseAwaiter";
+
+type ClientA = { type: "a"; client_message_id: string; value: number };
+type ClientB = { type: "b"; client_message_id: string; data: string };
+type ClientMsg = ClientA | ClientB;
+
+type ServerA = { type: "a"; client_message_id: string; value: number };
+type ServerB = { type: "b"; data: string };
+type ServerErr = { type: "err"; client_message_id: string; message: string };
+type ServerMsg = ServerA | ServerB | ServerErr;
+
+const extractId = (msg: ServerMsg) =>
+  (msg as { client_message_id?: string }).client_message_id;
+
+describe("ResponseAwaiter", () => {
+  const req: ClientMsg = {
+    type: "a",
+    client_message_id: "id_a",
+    value: 3,
+  };
+  const response: ServerMsg = {
+    type: "a",
+    client_message_id: "id_a",
+    value: 4,
+  };
+  const otherResponse: ServerMsg = {
+    type: "a",
+    client_message_id: "id_b",
+    value: 4,
+  };
+  const error: ServerMsg = {
+    type: "err",
+    client_message_id: "id_a",
+    message: "error",
+  };
+
+  it("should resolve", async function () {
+    const rh = ResponseAwaiter.init<ServerMsg>("err", extractId, 100);
+    const responseP = rh.waitForResponse(req.client_message_id);
+    expect(rh.onMessage(otherResponse)).eql(false);
+    expect(rh.onMessage(response)).eql(true);
+    expect(rh.onMessage(error)).eql(false);
+
+    expect(await responseP).eql(response);
+
+    // This (late) messages should be ignored.
+    expect(rh.onMessage(otherResponse)).eql(false);
+    expect(rh.onMessage(error)).eql(false);
+    expect(rh.onMessage(response)).eql(false);
+  });
+
+  it("should handle errors", async function () {
+    const rh = ResponseAwaiter.init<ServerMsg>("err", extractId, 100);
+    const responseP = rh.waitForResponse(req.client_message_id);
+    expect(rh.onMessage(otherResponse)).eql(false);
+    expect(rh.onMessage(error)).eql(true);
+    expect(rh.onMessage(response)).eql(false);
+
+    await expect(responseP).rejects.toThrow(error.message);
+
+    // This (late) messages should be ignored.
+    expect(rh.onMessage(otherResponse)).eql(false);
+    expect(rh.onMessage(error)).eql(false);
+    expect(rh.onMessage(response)).eql(false);
+  });
+
+  it("should handle timeouts", async function () {
+    const rh = ResponseAwaiter.init<ServerMsg>("err", extractId, 100);
+    const responseP = rh.waitForResponse(req.client_message_id);
+    expect(rh.onMessage(otherResponse)).eql(false);
+    expect(
+      rh.onMessage({ type: "a", client_message_id: "id_b", value: 4 })
+    ).eql(false);
+
+    await expect(responseP).rejects.toThrow();
+
+    // This (late) messages should be ignored.
+    expect(rh.onMessage(otherResponse)).eql(false);
+    expect(rh.onMessage(error)).eql(false);
+    expect(rh.onMessage(response)).eql(false);
+  });
+
+  it("should resolve with immediate", async function () {
+    const rh = ResponseAwaiter.initWithImmediate<ServerMsg, string>(
+      "err",
+      extractId,
+      (x: ServerMsg) => JSON.stringify(x),
+      100
+    );
+    const responseP = rh.waitForResponse(req.client_message_id);
+    expect(rh.onMessage(otherResponse)).eql(false);
+    expect(rh.onMessage(response)).eql(true);
+    expect(rh.onMessage(error)).eql(false);
+
+    expect(await responseP).eql(JSON.stringify(response));
+
+    // This (late) messages should be ignored.
+    expect(rh.onMessage(otherResponse)).eql(false);
+    expect(rh.onMessage(error)).eql(false);
+    expect(rh.onMessage(response)).eql(false);
+  });
+});

package/src/tool/agentChat.ts

@@ -127,13 +127,13 @@ export async function runChat(
 
   const [agent, sudoMcpServerManager] = await createAgentWithSkills(
     llmUrl,
-    agentProfile,
-    DEFAULT_AGENT_LLM_MODEL,
+    agentProfile.model || DEFAULT_AGENT_LLM_MODEL,
     eventHandler,
     NODE_PLATFORM,
     new ContextManager(agentProfile.system_prompt, conversation || []),
     llmApiKey,
     sudomcpConfig,
+    agentProfile.mcp_settings,
     utils.FRONTEND_PROD_AUTHORIZED_URL,
     stream
   );

package/src/tool/chatMain.ts

@@ -440,9 +440,9 @@ function getCLIEventHandler(
 
     switch (msg.type) {
       case "user_msg":
-        stdout.write(`[${msg.user_uuid}]: ${msg.message || ""}\n`);
+        stdout.write(`[${msg.user_nickname}]: ${msg.message || ""}\n`);
         if (msg.imageB64) {
-          stdout.write(`[${msg.user_uuid}]: IMAGE: ${msg.imageB64}\n`);
+          stdout.write(`[${msg.user_nickname}]: IMAGE: ${msg.imageB64}\n`);
         }
         break;
       case "agent_msg":

package/dist/agent/src/test/responseHandler.test.js

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const vitest_1 = require("vitest");
-const responseHandler_1 = require("../chat/client/responseHandler");
-describe("ResponseHandler", () => {
-    const req = {
-        type: "a",
-        client_message_id: "id_a",
-        value: 3,
-    };
-    const response = {
-        type: "a",
-        client_message_id: "id_a",
-        value: 4,
-    };
-    const otherResponse = {
-        type: "a",
-        client_message_id: "id_b",
-        value: 4,
-    };
-    const error = {
-        type: "err",
-        client_message_id: "id_a",
-        message: "error",
-    };
-    it("should resolve", async function () {
-        const rh = new responseHandler_1.ResponseHandler("err", 100);
-        const responseP = rh.waitForResponse(req);
-        rh.onMessage(otherResponse);
-        rh.onMessage(response);
-        rh.onMessage(error);
-        (0, vitest_1.expect)(await responseP).eql(response);
-        // This (late) messages should be ignored.
-        rh.onMessage(otherResponse);
-        rh.onMessage(error);
-        rh.onMessage(response);
-    });
-    it("should handle errors", async function () {
-        const rh = new responseHandler_1.ResponseHandler("err", 100);
-        const responseP = rh.waitForResponse(req);
-        rh.onMessage(otherResponse);
-        rh.onMessage(error);
-        rh.onMessage(response);
-        await (0, vitest_1.expect)(responseP).rejects.toThrow(error.message);
-        // This (late) messages should be ignored.
-        rh.onMessage(otherResponse);
-        rh.onMessage(error);
-        rh.onMessage(response);
-    });
-    it("should handle timeouts", async function () {
-        const rh = new responseHandler_1.ResponseHandler("err", 100);
-        const responseP = rh.waitForResponse(req);
-        rh.onMessage(otherResponse);
-        rh.onMessage({ type: "a", client_message_id: "id_b", value: 4 });
-        await (0, vitest_1.expect)(responseP).rejects.toThrow();
-        // This (late) messages should be ignored.
-        rh.onMessage(otherResponse);
-        rh.onMessage(error);
-        rh.onMessage(response);
-    });
-});

package/src/test/responseHandler.test.ts

@@ -1,78 +0,0 @@
-import { expect } from "vitest";
-import { ResponseHandler } from "../chat/client/responseHandler";
-
-type ClientA = { type: "a"; client_message_id: string; value: number };
-type ClientB = { type: "b"; client_message_id: string; data: string };
-type ClientMsg = ClientA | ClientB;
-
-type ServerA = { type: "a"; client_message_id: string; value: number };
-type ServerB = { type: "b"; data: string };
-type ServerErr = { type: "err"; client_message_id: string; message: string };
-type ServerMsg = ServerA | ServerB | ServerErr;
-
-describe("ResponseHandler", () => {
-  const req: ClientMsg = {
-    type: "a",
-    client_message_id: "id_a",
-    value: 3,
-  };
-  const response: ServerMsg = {
-    type: "a",
-    client_message_id: "id_a",
-    value: 4,
-  };
-  const otherResponse: ServerMsg = {
-    type: "a",
-    client_message_id: "id_b",
-    value: 4,
-  };
-  const error: ServerMsg = {
-    type: "err",
-    client_message_id: "id_a",
-    message: "error",
-  };
-
-  it("should resolve", async function () {
-    const rh = new ResponseHandler<ClientMsg, ServerMsg>("err", 100);
-    const responseP = rh.waitForResponse(req);
-    rh.onMessage(otherResponse);
-    rh.onMessage(response);
-    rh.onMessage(error);
-
-    expect(await responseP).eql(response);
-
-    // This (late) messages should be ignored.
-    rh.onMessage(otherResponse);
-    rh.onMessage(error);
-    rh.onMessage(response);
-  });
-
-  it("should handle errors", async function () {
-    const rh = new ResponseHandler<ClientMsg, ServerMsg>("err", 100);
-    const responseP = rh.waitForResponse(req);
-    rh.onMessage(otherResponse);
-    rh.onMessage(error);
-    rh.onMessage(response);
-
-    await expect(responseP).rejects.toThrow(error.message);
-
-    // This (late) messages should be ignored.
-    rh.onMessage(otherResponse);
-    rh.onMessage(error);
-    rh.onMessage(response);
-  });
-
-  it("should handle timeouts", async function () {
-    const rh = new ResponseHandler<ClientMsg, ServerMsg>("err", 100);
-    const responseP = rh.waitForResponse(req);
-    rh.onMessage(otherResponse);
-    rh.onMessage({ type: "a", client_message_id: "id_b", value: 4 });
-
-    await expect(responseP).rejects.toThrow();
-
-    // This (late) messages should be ignored.
-    rh.onMessage(otherResponse);
-    rh.onMessage(error);
-    rh.onMessage(response);
-  });
-});