@xalia/agent 0.6.9 → 0.6.11

package/src/test/testTools.ts

@@ -1,171 +0,0 @@
-import {
-  AssistantMessageParam,
-  MessageParam,
-  MessageToolCall,
-  ToolMessageParam,
-  ContentPartImage,
-  ToolDescriptor,
-  Completion,
-} from "../agent/llm";
-import { IAgentEventHandler } from "../agent/iAgentEventHandler";
-import { IPlatform } from "../agent/iplatform";
-import { DummyLLM, DummyLLMScriptEntry } from "../agent/dummyLLM";
-import { ILLM } from "../agent/llm";
-
-export const DUMMY_PLATFORM: IPlatform = {
-  openUrl: () => {
-    throw Error("unimpl");
-  },
-  load: () => {
-    throw Error("unimpl");
-  },
-  renderHTML: () => {
-    throw Error("unimpl");
-  },
-};
-
-/**
- * IAgentEventHandler which records all calls, for testing.
- */
-export class TestAgentEventHandler implements IAgentEventHandler {
-  private all: MessageParam[] = [];
-  private completions: AssistantMessageParam[] = [];
-  private images: ContentPartImage[] = [];
-  private agentMessages: string[] = [""];
-  private reasoning: string[] = [""];
-  private toolCalls: MessageToolCall[] = [];
-  private agentToolCalls: MessageToolCall[] = [];
-  private toolCallResults: ToolMessageParam[] = [];
-
-  onCompletion(result: AssistantMessageParam) {
-    this.completions.push(result);
-    this.all.push(result);
-  }
-
-  onImage(image: ContentPartImage) {
-    this.images.push(image);
-  }
-
-  onToolCallResult(result: ToolMessageParam): void {
-    this.toolCallResults.push(result);
-    this.all.push(result);
-  }
-
-  onAgentMessage(chunk: string, isEnd: boolean): Promise<void> {
-    this.agentMessages[this.agentMessages.length - 1] += chunk;
-    if (isEnd) {
-      this.agentMessages.push("");
-      this.reasoning.push("");
-    }
-    return new Promise<void>((r) => {
-      r();
-    });
-  }
-
-  onReasoning(reasoning: string): Promise<void> {
-    this.reasoning[this.reasoning.length - 1] += reasoning;
-    return new Promise<void>((r) => {
-      r();
-    });
-  }
-
-  onToolCall(
-    toolCall: MessageToolCall,
-    isAgentTool: boolean
-  ): Promise<boolean> {
-    return new Promise<boolean>((r) => {
-      this.toolCalls.push(toolCall);
-      if (isAgentTool) {
-        this.agentToolCalls.push(toolCall);
-      }
-      r(true);
-    });
-  }
-
-  getAll(): MessageParam[] {
-    return this.all;
-  }
-
-  getCompletions(): AssistantMessageParam[] {
-    return this.completions;
-  }
-
-  getAgentMessages(): string[] {
-    return this.agentMessages.slice(0, this.agentMessages.length - 1);
-  }
-
-  getToolCalls(): MessageToolCall[] {
-    return this.toolCalls;
-  }
-
-  getAgentToolCalls(): MessageToolCall[] {
-    return this.agentToolCalls;
-  }
-
-  getToolCallResults(): ToolMessageParam[] {
-    return this.toolCallResults;
-  }
-
-  getReasoning(): string[] {
-    return this.reasoning;
-  }
-}
-
-export type TestLLMRequest = {
-  messages: MessageParam[];
-  tools?: ToolDescriptor[];
-};
-
-/**
- * Extension of Dummy which records requests.  Doesn't inherit due to the
- * static initializers.
- */
-export class TestDummyLLM extends DummyLLM {
-  private readonly requests: TestLLMRequest[];
-
-  constructor(script: DummyLLMScriptEntry[]) {
-    super(script);
-    this.requests = [];
-  }
-
-  override getConversationResponse(
-    messages: MessageParam[],
-    tools?: ToolDescriptor[],
-    onMessage?: (msg: string, end: boolean) => Promise<void>,
-    onReasoning?: (reasoning: string) => Promise<void>
-  ): Promise<Completion> {
-    this.requests.push({ messages, tools });
-    return super.getConversationResponse(
-      messages,
-      tools,
-      onMessage,
-      onReasoning
-    );
-  }
-
-  getRequests(): TestLLMRequest[] {
-    return this.requests;
-  }
-}
-
-/**
- * An LLM which always errors out.
- */
-export class TestErrorLLM implements ILLM {
-  getModel(): string {
-    return "error";
-  }
-  getUrl(): string {
-    return "error://";
-  }
-  setModel(_model: string): void {
-    throw new Error("cannot set model");
-  }
-  getConversationResponse(
-    _messages: MessageParam[],
-    _tools?: ToolDescriptor[],
-    _onMessage?: (msg: string, end: boolean) => Promise<void>
-  ): Promise<Completion> {
-    throw new Error("LLM test error");
-  }
-}

package/src/test/tools.test.ts

@@ -1,39 +0,0 @@
-import { expect } from "vitest";
-import {
-  calculatorEval,
-  isoWithTimezone,
-  makeParseArgsFn,
-  openURL,
-} from "../chat/server/tools";
-
-describe("Tools", () => {
-  it("time_now should contain timezone", function () {
-    let time = isoWithTimezone("UTC");
-    console.log(time);
-    expect(time).includes("UTC");
-
-    time = isoWithTimezone("Asia/Tokyo");
-    console.log(time);
-    expect(time).includes("GMT+9");
-    expect(time).includes("Asia/Tokyo");
-  });
-
-  it("arithmetic should eval expressions", function () {
-    expect(calculatorEval("(3*4)-2")).eql("10");
-  });
-
-  it("openUrl grabs text from url without error", async function () {
-    const text = await openURL("https://www.google.com/");
-    console.log(text);
-    expect(text).not.contains("rror");
-  });
-
-  it("makeParseArgsFn behaves correctly", () => {
-    const parseNameValue = makeParseArgsFn(["name", "value"] as const);
-    expect(parseNameValue({ name: "adsf", value: "qwer" })).eql({
-      name: "adsf",
-      value: "qwer",
-    });
-    expect(() => parseNameValue({ name: "adsf" })).throws();
-  });
-});

package/src/tool/agentChat.ts

@@ -1,194 +0,0 @@
-import yocto from "yocto-spinner";
-import { Spinner } from "yocto-spinner";
-import chalk from "chalk";
-
-import { configuration, utils } from "@xalia/xmcp/tool";
-import { getLogger } from "@xalia/xmcp/sdk";
-
-import { AgentProfile } from "../agent/agent";
-import { createAgentWithSkills } from "../agent/agentUtils";
-import { IAgentEventHandler } from "../agent/iAgentEventHandler";
-
-import { loadImageAsDataUrlOrUndefined } from "./files";
-import { NODE_PLATFORM } from "./nodePlatform";
-import { CommandPrompt } from "./commandPrompt";
-import { IPrompt, Prompt } from "./prompt";
-import { ContextManager } from "../agent/context";
-import {
-  ContentPartImage,
-  MessageParam,
-  MessageToolCall,
-  ToolMessageParam,
-} from "../agent/llm";
-
-const logger = getLogger();
-
-export const DEFAULT_AGENT_LLM_MODEL =
-  process.env["DEFAULT_LLM_MODEL"] || "anthropic/claude-sonnet-4.5";
-
-async function write(msg: string): Promise<void> {
-  return new Promise((resolve, err) => {
-    process.stdout.write(msg, (e) => {
-      if (e) {
-        err(e);
-      } else {
-        resolve();
-      }
-    });
-  });
-}
-
-export async function runChat(
-  llmUrl: string,
-  agentProfile: AgentProfile,
-  conversation: MessageParam[] | undefined,
-  prompt: string | undefined,
-  image: string | undefined,
-  llmApiKey: string | undefined,
-  sudomcpConfig: configuration.Configuration,
-  approveToolsUpTo: number,
-  stream: boolean
-) {
-  // In chat mode, just print the messages.  Ask for tool confirmation
-  // unless approveTools is set.
-
-  const spinner: Spinner = yocto();
-  let first = true;
-  let reasoningFirst = true;
-
-  const onAgentMessage = async (msg: string, msgEnd: boolean) => {
-    if (first) {
-      first = false;
-
-      if (!reasoningFirst) {
-        await write(`${chalk.grey("]")}\n`);
-      }
-
-      await write("AGENT: ");
-      spinner.stop().clear();
-    }
-
-    if (msg) {
-      await write(msg);
-    }
-
-    if (msgEnd) {
-      await write("\n");
-      first = true;
-      reasoningFirst = true;
-    }
-  };
-
-  const onReasoning = async (reasoning: string) => {
-    logger.debug(`[AgentChat.onReasoning]: ${reasoning}`);
-    if (reasoningFirst) {
-      spinner.stop().clear();
-      await write(chalk.grey("[REASONING: "));
-      reasoningFirst = false;
-    }
-    await write(chalk.grey(reasoning));
-  };
-
-  const repl: IPrompt = new Prompt();
-  const cmdPrompt = new CommandPrompt(repl);
-
-  let remainingApprovedToolCalls = approveToolsUpTo;
-  const onToolCall = async (toolCall: MessageToolCall) => {
-    if (remainingApprovedToolCalls !== 0) {
-      --remainingApprovedToolCalls;
-      return true;
-    }
-
-    spinner.stop().clear();
-    const result = await cmdPrompt.promptToolCall(toolCall);
-    spinner.start();
-    return result;
-  };
-
-  const onToolCallResult = (result: ToolMessageParam) => {
-    // CLI doesn't need to display tool results - they're handled internally
-    logger.debug(`Tool call result: ${JSON.stringify(result)}`);
-  };
-
-  const onImage = (image: ContentPartImage) => {
-    const dataUrl = image.image_url.url;
-    void NODE_PLATFORM.renderHTML(`<img src="${dataUrl}" />`);
-  };
-
-  // Create event handler for CLI agent
-  const eventHandler: IAgentEventHandler = {
-    onCompletion: () => {},
-    onImage,
-    onAgentMessage,
-    onReasoning,
-    onToolCall,
-    onToolCallResult,
-  };
-
-  // Create agent
-
-  const [agent, sudoMcpServerManager] = await createAgentWithSkills(
-    llmUrl,
-    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
-  );
-
-  // Opening banner
-  console.log(chalk.green("SudoMCP Agent CLI"));
-  console.log(
-    `(Type ${chalk.yellow("/h")} for help, ${chalk.yellow("/q")} to quit.)`
-  );
-
-  // Display first prompt if supplied
-  if (prompt) {
-    console.log(`USER: ${prompt}`);
-  }
-
-  // Conversation loop
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  while (true) {
-    if (!prompt) {
-      const [msg, img] = await cmdPrompt.getNextPrompt(
-        agent,
-        sudoMcpServerManager
-      );
-      if (!msg && !img) {
-        break;
-      }
-      prompt = msg;
-      image = img;
-    }
-
-    image = loadImageAsDataUrlOrUndefined(image);
-
-    // Pass the prompt and image to the Agent
-    try {
-      spinner.start();
-      await agent.userMessageEx(prompt, image);
-    } catch (e) {
-      console.log(`ERROR: ${String(e)}`);
-      console.log(`  STACK: ${(e as Error).stack ?? "undefined"}`);
-    }
-    prompt = undefined;
-    image = undefined;
-  }
-
-  // Shutdown the agent
-
-  await cmdPrompt.shutdown();
-  await agent.shutdown();
-
-  logger.debug("shutdown done");
-}
-
-/**
- * Read lines from the prompt, parsing any commands, and return once there is
- * a prompt and/or image for the llm.  Both undefined means exit.
- */

package/src/tool/agentMain.ts

@@ -1,180 +0,0 @@
-import * as fs from "fs";
-import * as dotenv from "dotenv";
-import { command, option, flag, optional, string } from "cmd-ts";
-import { strict as assert } from "assert";
-
-import { configuration, utils } from "@xalia/xmcp/tool";
-import { getLogger } from "@xalia/xmcp/sdk";
-
-import { AgentProfile } from "../agent/agent";
-import { runOneShot } from "../agent/agentUtils";
-
-import {
-  llmUrl,
-  llmApiKey,
-  promptFile,
-  oneShot,
-  approveTools,
-  approveToolsUpTo,
-  imageFile,
-} from "./options";
-import {
-  loadFileOrUndefined,
-  loadFileOrStdin,
-  loadImageAsDataUrlOrUndefined,
-} from "./files";
-import { DEFAULT_AGENT_LLM_MODEL, runChat } from "./agentChat";
-import { NODE_PLATFORM } from "./nodePlatform";
-import { MessageParam } from "../agent/llm";
-
-dotenv.config();
-
-const logger = getLogger();
-
-export const agentMain = command({
-  name: "main",
-  args: {
-    promptFile,
-    imageFile,
-    llmUrl,
-    llmApiKey,
-    oneShot,
-    approveTools,
-    approveToolsUpTo,
-    sudomcpConfigFile: option({
-      type: optional(string),
-      long: "sudomcp-config-file",
-      description:
-        "SudoMCP config file (content or file, default: ~/config/..)",
-      env: "SUDOMCP_CONFIG",
-    }),
-    conversationFile: option({
-      type: optional(string),
-      long: "conversation",
-      description: "Restore conversation (content or file) (see /wc)",
-      env: "CONVERSATION",
-    }),
-    conversationOutputFile: option({
-      type: optional(string),
-      long: "conversation-output",
-      description: "Save final conversation to file (--one-shot mode)",
-      env: "CONVERSATION_OUTPUT",
-    }),
-    agentProfileFile: option({
-      type: optional(string),
-      long: "agent-profile",
-      description: "Agent profile (content or filename)",
-      env: "AGENT_PROFILE",
-    }),
-    noStreaming: flag({
-      long: "no-stream",
-      description: "Disable streaming (chat mode only)",
-    }),
-  },
-  handler: async ({
-    promptFile,
-    imageFile,
-    llmUrl,
-    llmApiKey,
-    oneShot,
-    approveTools,
-    approveToolsUpTo,
-    sudomcpConfigFile,
-    conversationFile,
-    conversationOutputFile,
-    agentProfileFile,
-    noStreaming,
-  }): Promise<void> => {
-    approveToolsUpTo = (() => {
-      if (typeof approveToolsUpTo === "undefined") {
-        // For the non-interactive case, `--approve-tools` is ignored.
-        if (oneShot) {
-          return -1;
-        }
-        return approveTools ? -1 : 0;
-      }
-      return approveToolsUpTo;
-    })();
-    assert(typeof approveToolsUpTo === "number");
-
-    // Load the AgentProfile or use a default
-
-    const agentProfile: AgentProfile = (() => {
-      let agentProfile = utils.loadContentOrFileOrUndefined(
-        agentProfileFile,
-        AgentProfile
-      );
-      if (!agentProfile) {
-        agentProfile = new AgentProfile(
-          undefined,
-          "You are a helpful agent",
-          {}
-        );
-      }
-
-      return agentProfile;
-    })();
-    logger.debug(`agent config: ${JSON.stringify(agentProfile)}`);
-
-    // Read sudomcp config file.  This will be used for SudoMcpServerManager,
-    // and also to fall back to the sudomcp api key if an explicit llmApiKey
-    // was not given.
-
-    const sudomcpConfig = configuration.loadEnsureConfig(sudomcpConfigFile);
-    if (!llmApiKey) {
-      llmApiKey = sudomcpConfig.api_key;
-      logger.debug(`using xmcp api key: ${llmApiKey}`);
-    }
-
-    // Restore conversation from value or file.
-
-    const startingConversation: MessageParam[] | undefined =
-      utils.loadContentOrFileOrUndefined(conversationFile);
-    logger.debug(
-      `startingConversation: ${JSON.stringify(startingConversation)}`
-    );
-
-    // Run in one-shot mode or chat-mode
-
-    if (oneShot) {
-      if (!promptFile) {
-        throw new Error("one-shot mode requires a prompt");
-      }
-      const prompt = await loadFileOrStdin(promptFile);
-
-      const { response, conversation } = await runOneShot(
-        llmUrl,
-        agentProfile,
-        DEFAULT_AGENT_LLM_MODEL,
-        startingConversation,
-        NODE_PLATFORM,
-        prompt,
-        loadImageAsDataUrlOrUndefined(imageFile),
-        llmApiKey,
-        sudomcpConfig,
-        approveToolsUpTo
-      );
-      console.log(response);
-
-      if (conversationOutputFile) {
-        logger.debug(`writing conversation to ${conversationOutputFile}:`);
-        logger.debug(`  conversation: ${JSON.stringify(conversation)}`);
-
-        fs.writeFileSync(conversationOutputFile, JSON.stringify(conversation));
-      }
-    } else {
-      const prompt = loadFileOrUndefined(promptFile);
-      return runChat(
-        llmUrl,
-        agentProfile,
-        startingConversation,
-        prompt,
-        imageFile,
-        llmApiKey,
-        sudomcpConfig,
-        approveToolsUpTo,
-        !noStreaming
-      );
-    }
-  },
-});